diff --git a/F-Droid/src/org/fdroid/fdroid/Utils.java b/F-Droid/src/org/fdroid/fdroid/Utils.java
index 9f02616e4..8aa75072c 100644
--- a/F-Droid/src/org/fdroid/fdroid/Utils.java
+++ b/F-Droid/src/org/fdroid/fdroid/Utils.java
@@ -304,9 +304,9 @@ public final class Utils {
         b.scheme(localRepoUri.getScheme().replaceFirst("http", "fdroidrepo"));
         b.appendQueryParameter("swap", "1");
         if (!TextUtils.isEmpty(FDroidApp.bssid)) {
-            b.appendQueryParameter("bssid", Uri.encode(FDroidApp.bssid));
+            b.appendQueryParameter("bssid", FDroidApp.bssid);
             if (!TextUtils.isEmpty(FDroidApp.ssid))
-                b.appendQueryParameter("ssid", Uri.encode(FDroidApp.ssid));
+                b.appendQueryParameter("ssid", FDroidApp.ssid);
         }
         return b.build();
     }
diff --git a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
index bb5e57bf6..ef2a4463b 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
@@ -7,6 +7,7 @@ import android.content.UriMatcher;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
+import android.text.TextUtils;
 import android.util.Log;
 
 import org.fdroid.fdroid.Preferences;
@@ -542,17 +543,22 @@ public class AppProvider extends FDroidProvider {
     }
 
     public static Uri getSearchUri(String query) {
-        return getContentUri().buildUpon()
-            .appendPath(PATH_SEARCH)
-            .appendEncodedPath(query)
-            .build();
+        if (TextUtils.isEmpty(query)) {
+            // Return all the things for an empty search.
+            return getContentUri();
+        } else {
+            return getContentUri().buildUpon()
+                    .appendPath(PATH_SEARCH)
+                    .appendPath(query)
+                    .build();
+        }
     }
 
     public static Uri getSearchInstalledUri(String query) {
         return getContentUri()
             .buildUpon()
             .appendPath(PATH_SEARCH_INSTALLED)
-            .appendEncodedPath(query)
+            .appendPath(query)
             .build();
     }
 
@@ -560,7 +566,7 @@ public class AppProvider extends FDroidProvider {
         return getContentUri()
             .buildUpon()
             .appendPath(PATH_SEARCH_CAN_UPDATE)
-            .appendEncodedPath(query)
+            .appendPath(query)
             .build();
     }
 
@@ -568,7 +574,7 @@ public class AppProvider extends FDroidProvider {
         return getContentUri().buildUpon()
             .appendPath(PATH_SEARCH_REPO)
             .appendPath(repo.id + "")
-            .appendEncodedPath(query)
+            .appendPath(query)
             .build();
     }