diff --git a/src/common.py b/src/common.py
index 355e848..7e653b3 100644
--- a/src/common.py
+++ b/src/common.py
@@ -85,9 +85,17 @@ class myUtils:
             data.append(row)
         try:
             for i in range(len(data)):
-                data[i][7] = data[i][7].split(",")[0]
+                data[i][7] = data[i][7].split(",")
+                for j in range(len(data[i])):
+                    if data[i][7][j] == "user":
+                        data[i][7] = "user"
+                        break
+
+                    if data[i][7][j] == "system":
+                        data[i][7] = "system"
+                        break
         except:
-            pass
+            print("error getting remote installation types")
         return data
 
     def getHostFlatpaks(self):
diff --git a/src/window.blp b/src/window.blp
index 5d6d952..32aa89e 100644
--- a/src/window.blp
+++ b/src/window.blp
@@ -75,7 +75,7 @@ template WarehouseWindow : Adw.ApplicationWindow {
         Adw.StatusPage no_flatpaks {
           icon-name: "error-symbolic";
           title: _("No Flatpaks Found");
-          description: _("Warehouse cannot see the list of installed Flatpaks or the system has no Flatpaks installed.");
+          description: _("There are either no Flatpaks that match the current filter, Warehouse cannot see the list of installed Flatpaks, or the system has no Flatpaks installed.");
         }
       }
     };