diff --git a/lib/app_sources/fdroidrepo.dart b/lib/app_sources/fdroidrepo.dart
index a1eb51a..1eb0262 100644
--- a/lib/app_sources/fdroidrepo.dart
+++ b/lib/app_sources/fdroidrepo.dart
@@ -163,6 +163,7 @@ class FDroidRepo extends AppSource {
     if (appIdOrName == null) {
       throw NoReleasesError();
     }
+    additionalSettings['appIdOrName'] = appIdOrName;
     var res =
         await sourceRequestWithURLVariants(standardUrl, additionalSettings);
     if (res.statusCode == 200) {
diff --git a/lib/pages/add_app.dart b/lib/pages/add_app.dart
index 1b35f79..faa610c 100644
--- a/lib/pages/add_app.dart
+++ b/lib/pages/add_app.dart
@@ -399,7 +399,7 @@ class AddAppPageState extends State<AddAppPage> {
                   [
                     GeneratedFormDropdown(
                         'overrideSource',
-                        defaultValue: '',
+                        defaultValue: pickedSourceOverride ?? '',
                         [
                           MapEntry('', tr('none')),
                           ...sourceProvider.sources.map(
diff --git a/lib/providers/source_provider.dart b/lib/providers/source_provider.dart
index 9de017f..50dd068 100644
--- a/lib/providers/source_provider.dart
+++ b/lib/providers/source_provider.dart
@@ -354,7 +354,9 @@ preStandardizeUrl(String url) {
       url.toLowerCase().indexOf('https://') != 0) {
     url = 'https://$url';
   }
-  var trailingSlash = Uri.tryParse(url)?.path.endsWith('/') ?? false;
+  var uri = Uri.tryParse(url);
+  var trailingSlash = (uri?.path.endsWith('/') ?? false) &&
+      (uri?.queryParameters.isEmpty ?? false);
   url = url
           .split('/')
           .where((e) => e.isNotEmpty)