diff --git a/package.json b/package.json
index ca6687f8c..0df06b781 100644
--- a/package.json
+++ b/package.json
@@ -122,4 +122,4 @@
     "esbuild",
     "@sveltejs/kit"
   ]
-}
\ No newline at end of file
+}
diff --git a/src/gql/users/user.graphql b/src/gql/users/user.graphql
index c201e65b9..6493d2ef6 100644
--- a/src/gql/users/user.graphql
+++ b/src/gql/users/user.graphql
@@ -40,6 +40,10 @@ query GetUser($user: UserID!) {
             note
           }
         }
+        tags {
+          id
+          name
+        }
       }
     }
     guides {
diff --git a/src/lib/components/auth/LoginDialog.svelte b/src/lib/components/auth/LoginDialog.svelte
index 7a43b37fc..7d28b46ae 100644
--- a/src/lib/components/auth/LoginDialog.svelte
+++ b/src/lib/components/auth/LoginDialog.svelte
@@ -6,7 +6,7 @@
     OAuthGoogleDocument,
     LogoutDocument
   } from '$lib/generated';
-  import { getContextClient, queryStore } from '@urql/svelte';
+  import { getContextClient } from '@urql/svelte';
   import { browser } from '$app/environment';
   import { page } from '$app/stores';
   import { user, userToken } from '$lib/stores/user';
@@ -23,14 +23,6 @@
   export const { t } = getTranslate();
 
   if (browser) {
-    const getMe = queryStore({
-      query: GetMeDocument,
-      client,
-      variables: {},
-      requestPolicy: 'network-only',
-      pause: true
-    });
-
     let first = true;
     userToken.subscribe((token) => {
       if (token) {
@@ -54,20 +46,16 @@
       first = false;
 
       if (token) {
-        getMe.pause();
-        getMe.resume();
-
-        const unsub = getMe.subscribe((response) => {
-          if (!response.fetching) {
+        client
+          .query(GetMeDocument, {}, { requestPolicy: 'network-only' })
+          .toPromise()
+          .then((response) => {
             if (response.error) {
               console.error(response.error.message);
-              unsub();
             } else if (response.data) {
               user.set(response.data.getMe);
-              unsub();
             }
-          }
-        });
+          });
       } else {
         user.set(null);
       }
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index c2c8a74a1..c393f6472 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -10,7 +10,7 @@
 
   export let data: PageData;
 
-  const { mods } = data;
+  $: ({ mods } = data);
 
   export const { t } = getTranslate();
 
diff --git a/src/routes/admin/sml-versions/[smlVersionId]/edit/+page.svelte b/src/routes/admin/sml-versions/[smlVersionId]/edit/+page.svelte
index eabdc7aa6..08e520b5e 100644
--- a/src/routes/admin/sml-versions/[smlVersionId]/edit/+page.svelte
+++ b/src/routes/admin/sml-versions/[smlVersionId]/edit/+page.svelte
@@ -11,13 +11,13 @@
 
   export let data: PageData;
 
-  const { smlVersionId } = data;
+  $: ({ smlVersionId } = data);
 
   const client = getContextClient();
 
   const toastStore = getToastStore();
 
-  const smlVersion = queryStore({
+  $: smlVersion = queryStore({
     query: GetSmlVersionAdminDocument,
     client,
     variables: { smlVersionID: smlVersionId }
diff --git a/src/routes/content-policy/index.svelte b/src/routes/content-policy/+page.svelte
similarity index 100%
rename from src/routes/content-policy/index.svelte
rename to src/routes/content-policy/+page.svelte
diff --git a/src/routes/guide/[guideId]/+page.svelte b/src/routes/guide/[guideId]/+page.svelte
index 80353d440..68228af65 100644
--- a/src/routes/guide/[guideId]/+page.svelte
+++ b/src/routes/guide/[guideId]/+page.svelte
@@ -14,7 +14,7 @@
 
   export let data: PageData;
 
-  const { guideId, guide } = data;
+  $: ({ guideId, guide } = data);
 
   const client = getContextClient();
 
diff --git a/src/routes/guide/[guideId]/edit/+page.svelte b/src/routes/guide/[guideId]/edit/+page.svelte
index a2bbc6565..6a144a743 100644
--- a/src/routes/guide/[guideId]/edit/+page.svelte
+++ b/src/routes/guide/[guideId]/edit/+page.svelte
@@ -11,13 +11,13 @@
 
   export let data: PageData;
 
-  const { guideId } = data;
+  $: ({ guideId } = data);
 
   const client = getContextClient();
 
   const toastStore = getToastStore();
 
-  const guide = queryStore({
+  $: guide = queryStore({
     query: GetGuideDocument,
     client,
     variables: { guide: guideId }
diff --git a/src/routes/mod/[modId]/+page.svelte b/src/routes/mod/[modId]/+page.svelte
index 5efb39f8d..dbe21cedc 100644
--- a/src/routes/mod/[modId]/+page.svelte
+++ b/src/routes/mod/[modId]/+page.svelte
@@ -20,7 +20,7 @@
 
   export let data: PageData;
 
-  const { modId, mod } = data;
+  $: ({ modId, mod } = data);
 
   const client = getContextClient();
 
diff --git a/src/routes/mod/[modId]/version/[versionId]/edit/+page.svelte b/src/routes/mod/[modId]/version/[versionId]/edit/+page.svelte
index ecdd3c09a..82498a473 100644
--- a/src/routes/mod/[modId]/version/[versionId]/edit/+page.svelte
+++ b/src/routes/mod/[modId]/version/[versionId]/edit/+page.svelte
@@ -11,13 +11,13 @@
 
   export let data: PageData;
 
-  const { modId, versionId } = data;
+  $: ({ modId, versionId } = data);
 
   const client = getContextClient();
 
   const toastStore = getToastStore();
 
-  const version = queryStore({
+  $: version = queryStore({
     query: GetModVersionDocument,
     client,
     variables: { version: versionId }
diff --git a/src/routes/user/[userId]/+page.svelte b/src/routes/user/[userId]/+page.svelte
index 1eeb80a77..1c571b658 100644
--- a/src/routes/user/[userId]/+page.svelte
+++ b/src/routes/user/[userId]/+page.svelte
@@ -11,7 +11,7 @@
 
   export let data: PageData;
 
-  const { user } = data;
+  $: ({ user } = data);
 
   let guidesTab = false;
 </script>