diff --git a/webui/src/views/Home.svelte b/webui/src/views/Home.svelte
index be8d3af..b36fe01 100644
--- a/webui/src/views/Home.svelte
+++ b/webui/src/views/Home.svelte
@@ -35,13 +35,13 @@
 
   const keyed = (async () => {
     const data = await api.query(
-      Query.join(
-        Query.matches(Variable("keyed"), ATTR_KEY, Any),
-        Query.matches(Variable("keyed"), [ATTR_LABEL, ATTR_KEY], Any),
-      ),
+      Query.matches(Variable("keyed"), ATTR_KEY, Any),
     );
     return Object.values(data.objects)
       .filter((obj) => !obj.get(ATTR_KEY)?.toString()?.startsWith("TYPE"))
+      .sort((a, b) =>
+        a.get(ATTR_KEY)?.toString().localeCompare(b.get(ATTR_KEY)?.toString()),
+      )
       .map((obj) => obj.address);
   })();