diff --git a/web/src/hooks.client.ts b/web/src/hooks.client.ts
index 622c6d5c..6e8996e4 100644
--- a/web/src/hooks.client.ts
+++ b/web/src/hooks.client.ts
@@ -1,9 +1,10 @@
 import type { User } from '$lib/models/user';
-import { pb } from '$lib/pocketbase';
+import { getPb } from '$lib/pocketbase';
 import { currentUser } from '$lib/stores/user_store';
 
+const pb = getPb();
 pb.authStore.loadFromCookie(document.cookie)
-pb.authStore.onChange(() => {  
+pb.authStore.onChange(() => {
   currentUser.set(pb.authStore.record as User)
   const secure = location.protocol === "https:"
   document.cookie = pb.authStore.exportToCookie({ httpOnly: false, secure: secure, sameSite: "Lax" })
diff --git a/web/src/hooks.server.ts b/web/src/hooks.server.ts
index 98534ddc..42b93bae 100644
--- a/web/src/hooks.server.ts
+++ b/web/src/hooks.server.ts
@@ -2,7 +2,7 @@ import { env } from '$env/dynamic/private'
 import { env as envPub } from '$env/dynamic/public'
 import type { Settings } from '$lib/models/settings'
 
-import { pb } from '$lib/pocketbase'
+import PocketBase from 'pocketbase'
 import { isRouteProtected } from '$lib/util/authorization_util'
 import { json, redirect, text, type Handle } from '@sveltejs/kit'
 import { sequence } from '@sveltejs/kit/hooks'
@@ -49,6 +49,7 @@ function isFormContentType(request: Request) {
 
 
 const auth: Handle = async ({ event, resolve }) => {
+  const pb = new PocketBase(envPub.PUBLIC_POCKETBASE_URL)
   // load the store data from the request cookie string
   pb.authStore.loadFromCookie(event.request.headers.get('cookie') || '')
 
@@ -80,8 +81,7 @@ const auth: Handle = async ({ event, resolve }) => {
     meiliApiKey = pb.authStore.record.token
     settings = await pb.collection('settings').getFirstListItem<Settings>(`user="${pb.authStore.record.id}"`, { requestKey: null })
   } else {
-    const r = await event.fetch(pb.buildURL("/public/search/token"));
-    const response = await r.json();
+    const response = await pb.send("/public/search/token", { method: "GET", fetch: event.fetch });
     meiliApiKey = response.token;
   }
   const ms = new MeiliSearch({ host: env.MEILI_URL, apiKey: meiliApiKey });
@@ -103,7 +103,7 @@ const auth: Handle = async ({ event, resolve }) => {
   const response = await resolve(event)
 
   // send back the default 'pb_auth' cookie to the client with the latest store state
-  const secure = event.url.protocol === "https:" 
+  const secure = event.url.protocol === "https:"
 
   response.headers.set(
     'set-cookie',
diff --git a/web/src/lib/components/nav_bar.svelte b/web/src/lib/components/nav_bar.svelte
index 1c89caad..136898a7 100644
--- a/web/src/lib/components/nav_bar.svelte
+++ b/web/src/lib/components/nav_bar.svelte
@@ -1,21 +1,26 @@
 <script lang="ts">
     import { afterNavigate, goto } from "$app/navigation";
+    import { page } from "$app/state";
     import LogoText from "$lib/components/logo/logo_text.svelte";
-    import { pb } from "$lib/pocketbase";
     import { theme, toggleTheme } from "$lib/stores/theme_store";
     import { currentUser, logout } from "$lib/stores/user_store";
     import { getFileURL } from "$lib/util/file_util";
+    import type { AuthRecord } from "pocketbase";
     import { _ } from "svelte-i18n";
     import { backInOut, cubicOut } from "svelte/easing";
+    import { Tween } from "svelte/motion";
     import Drawer from "./base/drawer.svelte";
     import Dropdown from "./base/dropdown.svelte";
     import LogoTextLight from "./logo/logo_text_light.svelte";
     import NotificationDropdown from "./notification/notification_dropdown.svelte";
-    import { browser } from "$app/environment";
-    import { page } from "$app/state";
-    import { Tween } from "svelte/motion";
     import UrlImportModal from "./settings/url_import_modal.svelte";
 
+    interface Props {
+        user: AuthRecord;
+    }
+
+    let { user }: Props = $props();
+
     let navBarItems = [
         { text: "Home", value: "/" },
         { text: $_("trail", { values: { n: 2 } }), value: "/trails" },
@@ -107,8 +112,6 @@
             urlImportModal.openModal();
         }
     }
-
-    let user = $derived(browser ? $currentUser : pb.authStore.record);
 </script>
 
 <Drawer bind:open={drawerOpen}>
diff --git a/web/src/lib/components/share_info.svelte b/web/src/lib/components/share_info.svelte
index 806baf37..8b69eae2 100644
--- a/web/src/lib/components/share_info.svelte
+++ b/web/src/lib/components/share_info.svelte
@@ -1,12 +1,11 @@
 <script lang="ts">
     import type { List } from "$lib/models/list";
     import type { Trail } from "$lib/models/trail";
-    import type { User, UserAnonymous } from "$lib/models/user";
-    import { pb } from "$lib/pocketbase";
-    import { users_show } from "$lib/stores/user_store";
+    import type { UserAnonymous } from "$lib/models/user";
+    import { currentUser, users_show } from "$lib/stores/user_store";
     import { getFileURL } from "$lib/util/file_util";
     import { _ } from "svelte-i18n";
-    import { fly, slide } from "svelte/transition";
+    import { fly } from "svelte/transition";
 
     interface Props {
         subject: Trail | List;
@@ -16,12 +15,15 @@
 
     let { subject, large = false, type }: Props = $props();
 
-    const shareData = type == "trail" ? (subject as Trail).expand?.trail_share_via_trail : (subject as List).expand?.list_share_via_list
+    const shareData =
+        type == "trail"
+            ? (subject as Trail).expand?.trail_share_via_trail
+            : (subject as List).expand?.list_share_via_list;
 
     let showInfo: boolean = $state(false);
     let loading: boolean = $state(false);
     let infoLoaded: boolean = $state(false);
-    let subjectIsOwned: boolean = subject.author == pb.authStore.record?.id;
+    let subjectIsOwned: boolean = subject.author == $currentUser?.id;
     let author: UserAnonymous | undefined = $state();
 
     async function fetchInfo() {
@@ -57,8 +59,9 @@
     {#if showInfo}
         <ul
             class="menu absolute z-10 top-8 bg-menu-background border border-input-border rounded-xl shadow-md overflow-hidden p-3 space-y-3 text-content -translate-x-3/4"
-            in:fly={{y: -10, duration: 150}} out:fly={{y: -10, duration: 150}}
-            >
+            in:fly={{ y: -10, duration: 150 }}
+            out:fly={{ y: -10, duration: 150 }}
+        >
             {#if loading}
                 <div class="spinner spinner-dark"></div>
             {:else if infoLoaded && shareData}
diff --git a/web/src/lib/components/trail/trail_card.svelte b/web/src/lib/components/trail/trail_card.svelte
index fdda1551..4bb31756 100644
--- a/web/src/lib/components/trail/trail_card.svelte
+++ b/web/src/lib/components/trail/trail_card.svelte
@@ -1,12 +1,10 @@
 <script lang="ts">
-    import { createBubbler } from "svelte/legacy";
 
-    const bubble = createBubbler();
     import emptyStateTrailDark from "$lib/assets/svgs/empty_states/empty_state_trail_dark.svg";
     import emptyStateTrailLight from "$lib/assets/svgs/empty_states/empty_state_trail_light.svg";
     import type { Trail } from "$lib/models/trail";
-    import { pb } from "$lib/pocketbase";
     import { theme } from "$lib/stores/theme_store";
+    import { currentUser } from "$lib/stores/user_store";
     import { getFileURL, isVideoURL } from "$lib/util/file_util";
     import {
         formatDistance,
@@ -14,7 +12,6 @@
         formatTimeHHMM,
     } from "$lib/util/format_util";
     import { _ } from "svelte-i18n";
-    import ShareInfo from "../share_info.svelte";
     import type { MouseEventHandler } from "svelte/elements";
     import Chip from "../base/chip.svelte";
 
@@ -75,13 +72,13 @@
             />
         {/if}
     </div>
-    {#if (trail.public || trailIsShared) && pb.authStore.record}
+    {#if (trail.public || trailIsShared) && $currentUser}
         <div
             class="flex absolute top-4 right-4 {trail.public && trailIsShared
                 ? 'w-14'
                 : 'w-8'} h-8 rounded-full items-center justify-center bg-background text-content"
         >
-            {#if trail.public && pb.authStore.record}
+            {#if trail.public && $currentUser}
                 <span
                     class="tooltip"
                     class:mr-2={trail.public && trailIsShared}
diff --git a/web/src/lib/components/trail/trail_dropdown.svelte b/web/src/lib/components/trail/trail_dropdown.svelte
index d2aef054..9396c551 100644
--- a/web/src/lib/components/trail/trail_dropdown.svelte
+++ b/web/src/lib/components/trail/trail_dropdown.svelte
@@ -9,18 +9,17 @@
     } from "$lib/stores/list_store";
     import { show_toast } from "$lib/stores/toast_store.svelte";
     import { trails_delete } from "$lib/stores/trail_store";
+    import { currentUser } from "$lib/stores/user_store";
+    import { getFileURL, saveAs } from "$lib/util/file_util";
     import { trail2gpx } from "$lib/util/gpx_util";
     import { gpx } from "$lib/vendor/toGeoJSON/toGeoJSON";
+    import JSZip from "jszip";
     import { _ } from "svelte-i18n";
     import Dropdown, { type DropdownItem } from "../base/dropdown.svelte";
     import ConfirmModal from "../confirm_modal.svelte";
     import ListSelectModal from "../list/list_select_modal.svelte";
     import TrailExportModal from "./trail_export_modal.svelte";
-    import JSZip from "jszip";
-    import { getFileURL, saveAs } from "$lib/util/file_util";
     import TrailShareModal from "./trail_share_modal.svelte";
-    import { currentUser } from "$lib/stores/user_store";
-    import { pb } from "$lib/pocketbase";
 
     interface Props {
         trail: Trail;
@@ -62,10 +61,10 @@
               ]
             : []),
         { text: $_("print"), value: "print", icon: "print" },
-        ...(trail.author != pb.authStore.record?.id
+        ...(trail.author != $currentUser?.id
             ? []
             : [{ text: $_("add-to-list"), value: "list", icon: "bookmark" }]),
-        ...(trail.author != pb.authStore.record?.id
+        ...(trail.author != $currentUser?.id
             ? []
             : [{ text: $_("share"), value: "share", icon: "share" }]),
         ...(allowEdit
diff --git a/web/src/lib/components/trail/trail_filter_panel.svelte b/web/src/lib/components/trail/trail_filter_panel.svelte
index 9221663f..f5a4c715 100644
--- a/web/src/lib/components/trail/trail_filter_panel.svelte
+++ b/web/src/lib/components/trail/trail_filter_panel.svelte
@@ -1,10 +1,13 @@
 <script lang="ts">
     import type { Category } from "$lib/models/category";
     import type { TrailFilter } from "$lib/models/trail";
-    import { country_codes } from "$lib/util/country_code_util";
+    import { searchLocations } from "$lib/stores/search_store";
+    import { tags_index } from "$lib/stores/tag_store";
     import { formatDistance, formatElevation } from "$lib/util/format_util";
+    import { getIconForLocation } from "$lib/util/icon_util";
     import { _ } from "svelte-i18n";
     import { slide } from "svelte/transition";
+    import Combobox, { type ComboboxItem } from "../base/combobox.svelte";
     import Datepicker from "../base/datepicker.svelte";
     import DoubleSlider from "../base/double_slider.svelte";
     import MultiSelect from "../base/multi_select.svelte";
@@ -14,12 +17,7 @@
     import type { SelectItem } from "../base/select.svelte";
     import Slider from "../base/slider.svelte";
     import UserSearch from "../user_search.svelte";
-    import { pb } from "$lib/pocketbase";
-    import { searchLocations } from "$lib/stores/search_store";
-    import { getIconForLocation } from "$lib/util/icon_util";
-    import { tags_index } from "$lib/stores/tag_store";
-    import Combobox, { type ComboboxItem } from "../base/combobox.svelte";
-    import { T } from "@threlte/core";
+    import { currentUser } from "$lib/stores/user_store";
 
     interface Props {
         categories: Category[];
@@ -199,7 +197,7 @@
             ></Combobox>
             <hr class="my-4 border-separator" />
 
-            {#if pb.authStore.record}
+            {#if $currentUser}
                 <UserSearch
                     onclick={(item) => setAuthorFilter(item)}
                     onclear={() => {
diff --git a/web/src/lib/components/trail/trail_info_panel.svelte b/web/src/lib/components/trail/trail_info_panel.svelte
index e98f17af..3c8bfa87 100644
--- a/web/src/lib/components/trail/trail_info_panel.svelte
+++ b/web/src/lib/components/trail/trail_info_panel.svelte
@@ -23,7 +23,6 @@
     import { browser } from "$app/environment";
     import emptyStateTrailDark from "$lib/assets/svgs/empty_states/empty_state_trail_dark.svg";
     import emptyStateTrailLight from "$lib/assets/svgs/empty_states/empty_state_trail_light.svg";
-    import { pb } from "$lib/pocketbase";
     import { theme } from "$lib/stores/theme_store";
     import { show_toast } from "$lib/stores/toast_store.svelte";
     import * as M from "maplibre-gl";
@@ -31,6 +30,7 @@
     import { onMount } from "svelte";
     import { _ } from "svelte-i18n";
     import Button from "../base/button.svelte";
+    import Chip from "../base/chip.svelte";
     import SkeletonNotificationCard from "../base/skeleton_notification_card.svelte";
     import Textarea from "../base/textarea.svelte";
     import CommentCard from "../comment/comment_card.svelte";
@@ -42,7 +42,6 @@
     import SummitLogTable from "../summit_log/summit_log_table.svelte";
     import MapWithElevationMaplibre from "./map_with_elevation_maplibre.svelte";
     import TrailTimeline from "./trail_timeline.svelte";
-    import Chip from "../base/chip.svelte";
 
     interface Props {
         initTrail: Trail;
@@ -63,7 +62,7 @@
     const tabs = [
         $_("summit-book"),
         $_("photos"),
-        ...(pb.authStore.record ? [$_("comment", { values: { n: 2 } })] : []),
+        ...($currentUser ? [$_("comment", { values: { n: 2 } })] : []),
     ];
 
     const trailIsShared =
@@ -234,13 +233,13 @@
                         {/each}
                     </div>
                 {/if}
-                {#if (trail.public || trailIsShared) && pb.authStore.record}
+                {#if (trail.public || trailIsShared) && $currentUser}
                     <div
                         class="flex {trail.public && trailIsShared
                             ? 'w-16'
                             : 'w-8'} h-8 rounded-full items-center"
                     >
-                        {#if trail.public && pb.authStore.record}
+                        {#if trail.public && $currentUser}
                             <span
                                 class:tooltip={mode != "map"}
                                 class:mr-3={trail.public && trailIsShared}
diff --git a/web/src/lib/components/trail/trail_list_item.svelte b/web/src/lib/components/trail/trail_list_item.svelte
index 909001f5..42902e4a 100644
--- a/web/src/lib/components/trail/trail_list_item.svelte
+++ b/web/src/lib/components/trail/trail_list_item.svelte
@@ -2,8 +2,8 @@
     import emptyStateTrailDark from "$lib/assets/svgs/empty_states/empty_state_trail_dark.svg";
     import emptyStateTrailLight from "$lib/assets/svgs/empty_states/empty_state_trail_light.svg";
     import type { Trail } from "$lib/models/trail";
-    import { pb } from "$lib/pocketbase";
     import { theme } from "$lib/stores/theme_store";
+    import { currentUser } from "$lib/stores/user_store";
     import { getFileURL, isVideoURL } from "$lib/util/file_util";
     import {
         formatDistance,
@@ -12,7 +12,6 @@
     } from "$lib/util/format_util";
     import { _ } from "svelte-i18n";
     import ShareInfo from "../share_info.svelte";
-    import Chip from "../base/chip.svelte";
 
     interface Props {
         trail: Trail;
@@ -55,7 +54,7 @@
             <h4 class="font-semibold text-lg">
                 {trail.name}
             </h4>
-            {#if trail.public && pb.authStore.record}
+            {#if trail.public && $currentUser}
                 <span class="tooltip ml-3" data-title={$_("public")}>
                     <i class="fa fa-globe"></i>
                 </span>
diff --git a/web/src/lib/i18n/index.ts b/web/src/lib/i18n/index.ts
index a12e6be8..f19da181 100644
--- a/web/src/lib/i18n/index.ts
+++ b/web/src/lib/i18n/index.ts
@@ -1,8 +1,6 @@
-import { browser } from '$app/environment'
-import { pb } from '$lib/pocketbase'
-import { currentUser } from '$lib/stores/user_store'
-import { init, register } from 'svelte-i18n'
-import { get } from 'svelte/store'
+import { browser } from '$app/environment';
+import { getPb } from '$lib/pocketbase';
+import { init, register } from 'svelte-i18n';
 
 const defaultLocale = 'en'
 
@@ -18,5 +16,5 @@ register('zh', () => import('./locales/zh.json'))
 
 init({
     fallbackLocale: defaultLocale,
-    initialLocale: browser ? pb.authStore.record?.language ?? window.navigator.language : defaultLocale,
+    initialLocale: browser ? getPb().authStore.record?.language ?? window.navigator.language : defaultLocale,
 })
\ No newline at end of file
diff --git a/web/src/lib/pocketbase.ts b/web/src/lib/pocketbase.ts
index 04fb9abf..e5856a77 100644
--- a/web/src/lib/pocketbase.ts
+++ b/web/src/lib/pocketbase.ts
@@ -1,8 +1,15 @@
+import { browser } from '$app/environment';
 import { env } from '$env/dynamic/public'
 import PocketBase from 'pocketbase'
 
-export function createInstance() {
-  return new PocketBase(env.PUBLIC_POCKETBASE_URL)
-}
+let pb: PocketBase;
 
-export const pb = createInstance()
\ No newline at end of file
+export function getPb(): PocketBase {
+  if(!browser) {
+    throw Error("Only available client side!")
+  }
+  if (!pb) {
+    pb = new PocketBase(env.PUBLIC_POCKETBASE_URL);
+  }
+  return pb;
+}
\ No newline at end of file
diff --git a/web/src/lib/stores/comment_store.ts b/web/src/lib/stores/comment_store.ts
index e0d01542..5c0f1792 100644
--- a/web/src/lib/stores/comment_store.ts
+++ b/web/src/lib/stores/comment_store.ts
@@ -1,9 +1,9 @@
 import { Comment } from "$lib/models/comment";
 import type { Trail } from "$lib/models/trail";
-import { pb } from "$lib/pocketbase";
 import { APIError } from "$lib/util/api_util";
 import { type ListResult } from "pocketbase";
-import { writable, type Writable } from "svelte/store";
+import { get, writable, type Writable } from "svelte/store";
+import { currentUser } from "./user_store";
 
 export const comments: Writable<Comment[]> = writable([])
 
@@ -28,11 +28,12 @@ export async function comments_index(trail: Trail) {
 }
 
 export async function comments_create(comment: Comment) {
-    if (!pb.authStore.record) {
-        throw new Error("Unauthenticated");
+    const user = get(currentUser)
+    if (!user) {
+        throw Error("Unauthenticated")
     }
 
-    comment.author = pb.authStore.record!.id;
+    comment.author = user.authStore.record!.id;
 
     let r = await fetch('/api/v1/comment', {
         method: 'PUT',
diff --git a/web/src/lib/stores/integration_store.ts b/web/src/lib/stores/integration_store.ts
index bbeb1105..1297a06c 100644
--- a/web/src/lib/stores/integration_store.ts
+++ b/web/src/lib/stores/integration_store.ts
@@ -1,8 +1,8 @@
 import { Integration } from "$lib/models/integration";
-import { pb } from "$lib/pocketbase";
 import { APIError } from "$lib/util/api_util";
 import { type ListResult } from "pocketbase";
-import { writable, type Writable } from "svelte/store";
+import { get, writable, type Writable } from "svelte/store";
+import { currentUser } from "./user_store";
 
 export const integrations: Writable<Integration[]> = writable([])
 
@@ -25,11 +25,12 @@ export async function integrations_index(f: (url: RequestInfo | URL, config?: Re
 }
 
 export async function integrations_create(integration: Integration) {
-    if (!pb.authStore.record) {
-        throw new Error("Unauthenticated");
+    const user = get(currentUser)
+    if (!user) {
+        throw Error("Unauthenticated")
     }
 
-    integration.user = pb.authStore.record!.id;
+    integration.user = user.id;
 
     let r = await fetch('/api/v1/integration', {
         method: 'PUT',
diff --git a/web/src/lib/stores/list_store.ts b/web/src/lib/stores/list_store.ts
index 689dbdb4..61592d3e 100644
--- a/web/src/lib/stores/list_store.ts
+++ b/web/src/lib/stores/list_store.ts
@@ -1,20 +1,22 @@
-import { List, type ListFilter, ExpandType, ExpandTypeToString } from "$lib/models/list";
+import { ExpandType, ExpandTypeToString, List, type ListFilter } from "$lib/models/list";
 import type { Trail } from "$lib/models/trail";
-import { pb } from "$lib/pocketbase";
-import { type ListResult } from "pocketbase";
-import { writable, type Writable } from "svelte/store";
-import { fetchGPX } from "./trail_store";
 import { APIError } from "$lib/util/api_util";
 import type { Hits } from "meilisearch";
+import { type AuthRecord, type ListResult } from "pocketbase";
+import { get, writable, type Writable } from "svelte/store";
+import { fetchGPX } from "./trail_store";
+import { currentUser } from "./user_store";
 
 let lists: List[] = []
 export const list: Writable<List | null> = writable(null)
 export const listTrail: Writable<Trail | null> = writable(null);
 
-export async function lists_index(filter?: ListFilter, page: number = 1, perPage: number = 5, 
+export async function lists_index(filter?: ListFilter, page: number = 1, perPage: number = 5,
     f: (url: RequestInfo | URL, config?: RequestInit) => Promise<Response> = fetch,
     e: ExpandType = ExpandType.All) {
-    const filterText = filter ? buildFilterText(filter) : ""
+    const user = get(currentUser)
+    
+    const filterText = filter ? buildFilterText(user, filter) : ""
 
     const r = await f('/api/v1/list?' + new URLSearchParams({
         sort: `${filter?.sortOrder ?? "-"}${filter?.sort ?? "name"}`,
@@ -42,8 +44,9 @@ export async function lists_index(filter?: ListFilter, page: number = 1, perPage
 
 
 export async function lists_search_filter(filter: ListFilter, page: number = 1, perPage: number = 5, f: (url: RequestInfo | URL, config?: RequestInit) => Promise<Response> = fetch): Promise<ListResult<List>> {
+    const user = get(currentUser)
 
-    const filterText = buildSearchFilterText(filter)
+    const filterText = buildSearchFilterText(user, filter)
 
     let r = await f("/api/v1/search/lists", {
         method: "POST",
@@ -96,7 +99,7 @@ export async function lists_search_filter(filter: ListFilter, page: number = 1,
 
 export async function lists_show(id: string, f: (url: RequestInfo | URL, config?: RequestInit) => Promise<Response> = fetch
     , e: ExpandType = ExpandType.All) {
-    
+
     const r = await f(`/api/v1/list/${id}?` + new URLSearchParams({
         expand: ExpandTypeToString(e)
     }), {
@@ -125,11 +128,11 @@ export async function lists_show(id: string, f: (url: RequestInfo | URL, config?
 }
 
 export async function lists_create(list: List, avatar?: File) {
-    if (!pb.authStore.record) {
-        throw new Error("Unauthenticated");
+    const user = get(currentUser)
+    if (!user) {
+        throw Error("Unauthenticated")
     }
-
-    list.author = pb.authStore.record!.id;
+    list.author = user.id;
 
     let r = await fetch('/api/v1/list', {
         method: 'PUT',
@@ -240,24 +243,24 @@ export async function lists_delete(list: List) {
 }
 
 
-function buildFilterText(filter: ListFilter): string {
+function buildFilterText(user: AuthRecord | undefined, filter: ListFilter): string {
     let filterText = `(name~"${filter.q}"||description~"${filter.q}")`
     if (filter.author?.length) {
         filterText += `&&author="${filter.author}"`
     }
-    if (pb.authStore.record) {
+    if (user) {
         if (filter.public === false && filter.shared === false) {
-            filterText += `&&author="${pb.authStore.record.id}"`
+            filterText += `&&author="${user.id}"`
         } else if (filter.public === true && filter.shared === false) {
-            filterText += `&&(public=true||list_share_via_list.user!="${pb.authStore.record.id}"||author="${pb.authStore.record.id}")`
+            filterText += `&&(public=true||list_share_via_list.user!="${user.id}"||author="${user.id}")`
         } else if (filter.public === false && filter.shared === true) {
-            filterText += `&&(public=false||list_share_via_list.user="${pb.authStore.record.id}"||author="${pb.authStore.record.id}")`
+            filterText += `&&(public=false||list_share_via_list.user="${user.id}"||author="${user.id}")`
         }
     }
     return filterText
 }
 
-function buildSearchFilterText(filter: ListFilter): string {
+function buildSearchFilterText(user: AuthRecord, filter: ListFilter): string {
     let filterText: string = "";
 
     if (filter.author?.length) {
@@ -272,17 +275,17 @@ function buildSearchFilterText(filter: ListFilter): string {
         if (filter.public !== undefined) {
             filterText += `(public = ${filter.public}`
 
-            if (!filter.author?.length || filter.author == pb.authStore.record?.id) {
-                filterText += ` OR author = ${pb.authStore.record?.id}`
+            if (!filter.author?.length || filter.author == user?.id) {
+                filterText += ` OR author = ${user?.id}`
             }
             filterText += ")"
         }
 
         if (filter.shared !== undefined) {
             if (filter.shared === true) {
-                filterText += ` OR shares = ${pb.authStore.record?.id}`
+                filterText += ` OR shares = ${user?.id}`
             } else {
-                filterText += ` AND NOT shares = ${pb.authStore.record?.id}`
+                filterText += ` AND NOT shares = ${user?.id}`
 
             }
         }
diff --git a/web/src/lib/stores/summit_log_store.ts b/web/src/lib/stores/summit_log_store.ts
index 8e4d6afd..053e295f 100644
--- a/web/src/lib/stores/summit_log_store.ts
+++ b/web/src/lib/stores/summit_log_store.ts
@@ -1,9 +1,8 @@
 import { SummitLog, type SummitLogFilter } from "$lib/models/summit_log";
-import { pb } from "$lib/pocketbase";
-import { type ListResult } from "pocketbase";
-import { writable, type Writable } from "svelte/store";
-import { fetchGPX } from "./trail_store";
 import { APIError } from "$lib/util/api_util";
+import { type ListResult } from "pocketbase";
+import { get, writable, type Writable } from "svelte/store";
+import { currentUser } from "./user_store";
 
 export const summitLog: Writable<SummitLog> = writable(new SummitLog(new Date().toISOString().substring(0, 10)));
 export const summitLogs: Writable<SummitLog[]> = writable([]);
@@ -47,7 +46,12 @@ export async function summit_logs_index(author: string, filter?: SummitLogFilter
 }
 
 export async function summit_logs_create(summitLog: SummitLog, f: (url: RequestInfo | URL, config?: RequestInit) => Promise<Response> = fetch) {
-    summitLog.author = pb.authStore.record!.id
+    const user = get(currentUser)
+    if (!user) {
+        throw Error("Unauthenticated")
+    }
+
+    summitLog.author = user.id
 
     let r = await f('/api/v1/summit-log', {
         method: 'PUT',
@@ -102,7 +106,12 @@ export async function summit_logs_create(summitLog: SummitLog, f: (url: RequestI
 }
 
 export async function summit_logs_update(oldSummitLog: SummitLog, newSummitLog: SummitLog) {
-    newSummitLog.author = pb.authStore.record!.id
+    const user = get(currentUser)
+    if (!user) {
+        throw Error("Unauthenticated")
+    }
+
+    newSummitLog.author = user.id
 
     let r = await fetch('/api/v1/summit-log/' + newSummitLog.id, {
         method: 'POST',
diff --git a/web/src/lib/stores/trail_store.ts b/web/src/lib/stores/trail_store.ts
index 6e41e86d..a8c73012 100644
--- a/web/src/lib/stores/trail_store.ts
+++ b/web/src/lib/stores/trail_store.ts
@@ -1,18 +1,18 @@
 import type { SummitLog } from "$lib/models/summit_log";
+import type { Tag } from "$lib/models/tag";
 import { defaultTrailSearchAttributes, Trail, type TrailFilter, type TrailFilterValues, type TrailSearchResult } from "$lib/models/trail";
 import type { Waypoint } from "$lib/models/waypoint";
-import { pb } from "$lib/pocketbase";
+import { APIError } from "$lib/util/api_util";
 import { deepEqual } from "$lib/util/deep_util";
 import { getFileURL } from "$lib/util/file_util";
 import * as M from "maplibre-gl";
 import type { Hits } from "meilisearch";
-import { type ListResult, type RecordModel } from "pocketbase";
-import { writable, type Writable } from "svelte/store";
+import { type AuthRecord, type ListResult, type RecordModel } from "pocketbase";
+import { get, writable, type Writable } from "svelte/store";
 import { summit_logs_create, summit_logs_delete, summit_logs_update } from "./summit_log_store";
-import { waypoints_create, waypoints_delete, waypoints_update } from "./waypoint_store";
-import { APIError } from "$lib/util/api_util";
 import { tags_create } from "./tag_store";
-import type { Tag } from "$lib/models/tag";
+import { currentUser } from "./user_store";
+import { waypoints_create, waypoints_delete, waypoints_update } from "./waypoint_store";
 
 let trails: Trail[] = []
 export const trail: Writable<Trail> = writable(new Trail(""));
@@ -57,7 +57,9 @@ export async function trails_recommend(size: number, f: (url: RequestInfo | URL,
 }
 
 export async function trails_search_filter(filter: TrailFilter, page: number = 1, f: (url: RequestInfo | URL, config?: RequestInit) => Promise<Response> = fetch) {
-    let filterText: string = buildFilterText(filter, true);
+    const user = get(currentUser)
+
+    let filterText: string = buildFilterText(user, filter, true);
 
     let r = await f("/api/v1/search/trails", {
         method: "POST",
@@ -91,11 +93,12 @@ export async function trails_search_filter(filter: TrailFilter, page: number = 1
 }
 
 export async function trails_search_bounding_box(northEast: M.LngLat, southWest: M.LngLat, filter?: TrailFilter, page: number = 1, includePolyline: boolean = true) {
+    const user = get(currentUser)
 
     let filterText: string = "";
 
     if (filter) {
-        filterText = buildFilterText(filter, false);
+        filterText = buildFilterText(user, filter, false);
     }
 
     let r = await fetch("/api/v1/search/trails", {
@@ -173,6 +176,10 @@ export async function trails_show(id: string, loadGPX?: boolean, f: (url: Reques
 }
 
 export async function trails_create(trail: Trail, photos: File[], gpx: File | Blob | null, f: (url: RequestInfo | URL, config?: RequestInit) => Promise<Response> = fetch) {
+    const user = get(currentUser)
+    if (!user) {
+        throw Error("Unauthenticated")
+    }
 
     for (const waypoint of trail.expand?.waypoints ?? []) {
         const model = await waypoints_create({
@@ -194,7 +201,7 @@ export async function trails_create(trail: Trail, photos: File[], gpx: File | Bl
         }
     }
 
-    trail.author = pb.authStore.record!.id
+    trail.author = user.id
 
     let r = await f(`/api/v1/trail?` + new URLSearchParams({
         expand: "category,waypoints,summit_logs,trail_share_via_trail,tags",
@@ -500,7 +507,7 @@ async function searchResultToTrailList(hits: Hits<TrailSearchResult>): Promise<T
     return trails
 }
 
-function buildFilterText(filter: TrailFilter, includeGeo: boolean): string {
+function buildFilterText(user: AuthRecord, filter: TrailFilter, includeGeo: boolean): string {
     let filterText: string = "";
 
     filterText += `distance >= ${Math.floor(filter.distanceMin)} AND elevation_gain >= ${Math.floor(filter.elevationGainMin)} AND elevation_loss >= ${Math.floor(filter.elevationLossMin)}`
@@ -530,17 +537,17 @@ function buildFilterText(filter: TrailFilter, includeGeo: boolean): string {
         if (filter.public !== undefined) {
             filterText += `(public = ${filter.public}`
 
-            if (!filter.author?.length || filter.author == pb.authStore.record?.id) {
-                filterText += ` OR author = ${pb.authStore.record?.id}`
+            if (!filter.author?.length || filter.author == user?.id) {
+                filterText += ` OR author = ${user?.id}`
             }
             filterText += ")"
         }
 
         if (filter.shared !== undefined) {
             if (filter.shared === true) {
-                filterText += ` OR shares = ${pb.authStore.record?.id}`
+                filterText += ` OR shares = ${user?.id}`
             } else {
-                filterText += ` AND NOT shares = ${pb.authStore.record?.id}`
+                filterText += ` AND NOT shares = ${user?.id}`
 
             }
         }
diff --git a/web/src/lib/stores/user_store.ts b/web/src/lib/stores/user_store.ts
index 5290f22b..b7f117e7 100644
--- a/web/src/lib/stores/user_store.ts
+++ b/web/src/lib/stores/user_store.ts
@@ -1,8 +1,8 @@
 import type { User, UserAnonymous } from "$lib/models/user";
-import { pb } from "$lib/pocketbase";
+import { getPb } from "$lib/pocketbase";
 import { APIError } from "$lib/util/api_util";
 import { type AuthMethodsList } from "pocketbase";
-import { writable, type Writable } from "svelte/store";
+import { get, writable, type Writable } from "svelte/store";
 
 export const currentUser: Writable<User | null> = writable<User | null>()
 
@@ -24,8 +24,10 @@ export async function users_create(user: User) {
 }
 
 export async function users_search(q: string, includeSelf: boolean = true) {
+    const user = get(currentUser)
+
     let r = await fetch('/api/v1/user/anonymous?' + new URLSearchParams({
-        "filter": `username~"${q}"${includeSelf ? '' : `&&id!="${pb.authStore.record?.id}"`}`,
+        "filter": `username~"${q}"${includeSelf ? '' : `&&id!="${user?.id}"`}`,
     }), {
         method: 'GET',
     })
@@ -69,6 +71,8 @@ export async function users_auth_methods(f: (url: RequestInfo | URL, config?: Re
 
 
 export async function login(user: User) {
+    const pb = getPb();
+
     const r = await fetch('/api/v1/auth/login', {
         method: 'POST',
         body: JSON.stringify(user),
@@ -83,6 +87,8 @@ export async function login(user: User) {
 }
 
 export async function oauth_login(data: { name: string, code: string, codeVerifier: string }) {
+    const pb = getPb();
+
     const r = await fetch('/api/v1/auth/oauth', {
         method: 'POST',
         body: JSON.stringify(data)
@@ -98,6 +104,8 @@ export async function oauth_login(data: { name: string, code: string, codeVerifi
 
 
 export async function logout() {
+    const pb = getPb();
+
     pb.authStore.clear();
 }
 
diff --git a/web/src/lib/stores/waypoint_store.ts b/web/src/lib/stores/waypoint_store.ts
index 2509e148..895849e1 100644
--- a/web/src/lib/stores/waypoint_store.ts
+++ b/web/src/lib/stores/waypoint_store.ts
@@ -1,13 +1,17 @@
 import { Waypoint } from "$lib/models/waypoint";
-import { pb } from "$lib/pocketbase";
 import { APIError } from "$lib/util/api_util";
-import { writable, type Writable } from "svelte/store";
+import { get, writable, type Writable } from "svelte/store";
+import { currentUser } from "./user_store";
 
 export const waypoint: Writable<Waypoint> = writable(new Waypoint(0, 0));
 
 export async function waypoints_create(waypoint: Waypoint, f: (url: RequestInfo | URL, config?: RequestInit) => Promise<Response> = fetch) {
+    const user = get(currentUser)
+    if (!user) {
+        throw Error("Unauthenticated")
+    }
 
-    waypoint.author = pb.authStore.record!.id
+    waypoint.author = user.id
 
     let r = await f('/api/v1/waypoint', {
         method: 'PUT',
@@ -45,7 +49,11 @@ export async function waypoints_create(waypoint: Waypoint, f: (url: RequestInfo
 }
 
 export async function waypoints_update(oldWaypoint: Waypoint, newWaypoint: Waypoint) {
-    newWaypoint.author = pb.authStore.record!.id
+    const user = get(currentUser)
+    if (!user) {
+        throw Error("Unauthenticated")
+    }
+    newWaypoint.author = user.id
 
     let r = await fetch('/api/v1/waypoint/' + newWaypoint.id, {
         method: 'POST',
diff --git a/web/src/lib/util/api_util.ts b/web/src/lib/util/api_util.ts
index 60fe91af..92d5ab01 100644
--- a/web/src/lib/util/api_util.ts
+++ b/web/src/lib/util/api_util.ts
@@ -1,6 +1,5 @@
 import { error, type NumericRange, type RequestEvent } from "@sveltejs/kit";
 import { ClientResponseError, type ListResult } from "pocketbase";
-import { pb } from "$lib/pocketbase";
 import { ZodError, type ZodSchema } from "zod";
 import { RecordListOptionsSchema, RecordIdSchema, RecordOptionsSchema } from "$lib/models/api/base_schema";
 
@@ -46,7 +45,7 @@ export async function list<T>(event: RequestEvent, collection: Collection) {
 
     let r: ListResult<T>;
     if ((safeSearchParams.perPage ?? 0) < 0) {
-        const activities: T[] = await pb.collection(Collection[collection])
+        const activities: T[] = await event.locals.pb.collection(Collection[collection])
             .getFullList<T>(safeSearchParams)
         r = {
             items: activities,
@@ -56,7 +55,7 @@ export async function list<T>(event: RequestEvent, collection: Collection) {
             totalPages: 1
         }
     } else {
-        r = await pb.collection(Collection[collection])
+        r = await event.locals.pb.collection(Collection[collection])
             .getList<T>(safeSearchParams.page, safeSearchParams.perPage, { ...safeSearchParams })
     }
     return r
@@ -69,7 +68,7 @@ export async function show<T>(event: RequestEvent, collection: Collection) {
     const searchParams = Object.fromEntries(event.url.searchParams);
     const safeSearchParams = RecordOptionsSchema.parse(searchParams);
 
-    const r = await pb.collection(collection.toString())
+    const r = await event.locals.pb.collection(collection.toString())
         .getOne<T>(safeParams.id, safeSearchParams)
 
     return r
@@ -82,7 +81,7 @@ export async function create<T>(event: RequestEvent, schema: ZodSchema, collecti
     const data = await event.request.json();
     const safeData = schema.parse(data);
 
-    const r = await pb.collection(Collection[collection]).create<T>(safeData, {...safeSearchParams, requestKey: null})
+    const r = await event.locals.pb.collection(Collection[collection]).create<T>(safeData, {...safeSearchParams, requestKey: null})
 
     return r
 }
@@ -97,7 +96,7 @@ export async function update<T>(event: RequestEvent, schema: ZodSchema, collecti
     const data = await event.request.json();
     const safeData = schema.parse(data);
 
-    const r = await pb.collection(Collection[collection]).update<T>(safeParams.id, safeData, safeSearchParams)
+    const r = await event.locals.pb.collection(Collection[collection]).update<T>(safeParams.id, safeData, safeSearchParams)
 
     return r
 }
@@ -108,7 +107,7 @@ export async function upload<T>(event: RequestEvent, collection: Collection) {
 
     const data = await event.request.formData();
 
-    const r = await pb.collection(Collection[collection]).update<T>(safeParams.id, data)
+    const r = await event.locals.pb.collection(Collection[collection]).update<T>(safeParams.id, data)
 
     return r
 }
@@ -117,7 +116,7 @@ export async function remove(event: RequestEvent, collection: Collection) {
     const params = event.params
     const safeParams = RecordIdSchema.parse(params);
 
-    const r = await pb.collection(Collection[collection]).delete(safeParams.id)
+    const r = await event.locals.pb.collection(Collection[collection]).delete(safeParams.id)
 
     return { 'acknowledged': r }
 }
diff --git a/web/src/routes/+layout.server.ts b/web/src/routes/+layout.server.ts
index 7d8e5772..98f7dc48 100644
--- a/web/src/routes/+layout.server.ts
+++ b/web/src/routes/+layout.server.ts
@@ -4,6 +4,7 @@ import type { LayoutServerLoad } from './$types';
 import { env } from "$env/dynamic/private";
 import type { Settings } from '$lib/models/settings';
 import { notifications_index } from '$lib/stores/notification_store';
+import type { AuthRecord } from 'pocketbase';
 
 export const load: LayoutServerLoad = async ({ locals, url, fetch }) => {
 
@@ -11,5 +12,5 @@ export const load: LayoutServerLoad = async ({ locals, url, fetch }) => {
 	if (locals.user?.id) {
 		notifications = await notifications_index({ recipient: locals.user.id }, 1, 10, fetch);
 	}
-	return { settings: locals.settings as Settings, notifications, origin: env.ORIGIN }
+	return { settings: locals.settings as Settings, user: locals.user as AuthRecord, notifications, origin: env.ORIGIN }
 }
\ No newline at end of file
diff --git a/web/src/routes/+layout.svelte b/web/src/routes/+layout.svelte
index 76db674f..8b538006 100644
--- a/web/src/routes/+layout.svelte
+++ b/web/src/routes/+layout.svelte
@@ -15,11 +15,14 @@
     import "../css/app.css";
     import "../css/components.css";
     import "../css/theme.css";
+    import type { LayoutData } from "./$types";
+
     interface Props {
+        data: LayoutData;
         children?: Snippet;
     }
 
-    let { children }: Props = $props();
+    let { data, children }: Props = $props();
 
     beforeNavigate((n) => {
         if (!$currentUser && isRouteProtected(n.to?.url?.pathname ?? "")) {
@@ -80,7 +83,7 @@
     </div>
 {/if}
 
-<NavBar></NavBar>
+<NavBar user={data.user}></NavBar>
 <PageLoadingBar class="text-content"></PageLoadingBar>
 <Toast></Toast>
 <UploadDialog></UploadDialog>
diff --git a/web/src/routes/api/v1/auth/confirm-reset/+server.ts b/web/src/routes/api/v1/auth/confirm-reset/+server.ts
index ad5d2af5..0e9b0b4d 100644
--- a/web/src/routes/api/v1/auth/confirm-reset/+server.ts
+++ b/web/src/routes/api/v1/auth/confirm-reset/+server.ts
@@ -1,6 +1,5 @@
-import { pb } from "$lib/pocketbase";
 import { handleError } from "$lib/util/api_util";
-import { error, json, type RequestEvent } from "@sveltejs/kit";
+import { json, type RequestEvent } from "@sveltejs/kit";
 import { z } from "zod";
 
 export async function POST(event: RequestEvent) {
@@ -11,7 +10,7 @@ export async function POST(event: RequestEvent) {
             password: z.string().min(8).max(72),
             passwordConfirm: z.string().min(8).max(72)
         }).refine(d => d.password === d.passwordConfirm).parse(data)
-        const r = await pb.collection('users').confirmPasswordReset(safeData.token, safeData.password, safeData.passwordConfirm);
+        const r = await event.locals.pb.collection('users').confirmPasswordReset(safeData.token, safeData.password, safeData.passwordConfirm);
         return json(r);
     } catch (e: any) {
         throw handleError(e);
diff --git a/web/src/routes/api/v1/auth/login/+server.ts b/web/src/routes/api/v1/auth/login/+server.ts
index 7da3ee52..b0ba25eb 100644
--- a/web/src/routes/api/v1/auth/login/+server.ts
+++ b/web/src/routes/api/v1/auth/login/+server.ts
@@ -1,6 +1,5 @@
-import { pb } from "$lib/pocketbase";
 import { handleError } from "$lib/util/api_util";
-import { error, json, type RequestEvent } from "@sveltejs/kit";
+import { json, type RequestEvent } from "@sveltejs/kit";
 import { z } from "zod";
 
 export async function POST(event: RequestEvent) {
@@ -13,7 +12,7 @@ export async function POST(event: RequestEvent) {
         }).refine(d => d.email !== undefined || d.username !== undefined).parse(data);
 
 
-        const r = await pb.collection('users').authWithPassword(safeData.email ?? safeData.username!, data.password);
+        const r = await event.locals.pb.collection('users').authWithPassword(safeData.email ?? safeData.username!, data.password);
         return json(r);
     } catch (e: any) {
         throw handleError(e);
diff --git a/web/src/routes/api/v1/auth/oauth/+server.ts b/web/src/routes/api/v1/auth/oauth/+server.ts
index b5d20c62..2cdfdac3 100644
--- a/web/src/routes/api/v1/auth/oauth/+server.ts
+++ b/web/src/routes/api/v1/auth/oauth/+server.ts
@@ -1,7 +1,6 @@
 import { env } from "$env/dynamic/public";
 import { env as private_env } from "$env/dynamic/private";
 
-import { pb } from "$lib/pocketbase";
 import { error, json, type RequestEvent } from "@sveltejs/kit";
 import { z } from "zod";
 import { handleError } from "$lib/util/api_util";
@@ -10,7 +9,7 @@ const redirectURL = private_env.ORIGIN + "/login/redirect"
 
 export async function GET(event: RequestEvent) {
     try {
-        const r = await pb.collection('users').listAuthMethods();
+        const r = await event.locals.pb.collection('users').listAuthMethods();
 
         for (const provider of r.oauth2.providers) {
             const imageURL = `${env.PUBLIC_POCKETBASE_URL}/_/images/oauth2/${provider.name}.svg`
@@ -33,7 +32,7 @@ export async function POST(event: RequestEvent) {
             codeVerifier: z.string()
         }).parse(data)
 
-        const r = await pb.collection('users').authWithOAuth2Code(
+        const r = await event.locals.pb.collection('users').authWithOAuth2Code(
             safeData.name,
             safeData.code,
             safeData.codeVerifier,
diff --git a/web/src/routes/api/v1/auth/reset/+server.ts b/web/src/routes/api/v1/auth/reset/+server.ts
index 6e7c802e..d9287f14 100644
--- a/web/src/routes/api/v1/auth/reset/+server.ts
+++ b/web/src/routes/api/v1/auth/reset/+server.ts
@@ -1,4 +1,3 @@
-import { pb } from "$lib/pocketbase";
 import { handleError } from "$lib/util/api_util";
 import { error, json, type RequestEvent } from "@sveltejs/kit";
 import { z } from "zod";
@@ -10,7 +9,7 @@ export async function POST(event: RequestEvent) {
             email: z.string().email()
         }).parse(data)
 
-        const r = await pb.collection('users').requestPasswordReset(safeData.email);
+        const r = await event.locals.pb.collection('users').requestPasswordReset(safeData.email);
         return json(r);
     } catch (e: any) {
         throw handleError(e);
diff --git a/web/src/routes/api/v1/comment/+server.ts b/web/src/routes/api/v1/comment/+server.ts
index 1d3fca43..cae3792a 100644
--- a/web/src/routes/api/v1/comment/+server.ts
+++ b/web/src/routes/api/v1/comment/+server.ts
@@ -1,6 +1,5 @@
 import { CommentCreateSchema } from '$lib/models/api/comment_schema';
 import type { Comment } from '$lib/models/comment';
-import { pb } from '$lib/pocketbase';
 import { Collection, create, handleError, list } from '$lib/util/api_util';
 import { json, type RequestEvent } from '@sveltejs/kit';
 
@@ -10,7 +9,7 @@ export async function GET(event: RequestEvent) {
         for (const comment of r.items) {
             if (!comment.expand?.author) {
                 comment.expand = {
-                    author: await pb.collection('users_anonymous').getOne(comment.author)
+                    author: await event.locals.pb.collection('users_anonymous').getOne(comment.author)
                 }
             }
         }
diff --git a/web/src/routes/api/v1/comment/[id]/+server.ts b/web/src/routes/api/v1/comment/[id]/+server.ts
index 70d395b6..527c007b 100644
--- a/web/src/routes/api/v1/comment/[id]/+server.ts
+++ b/web/src/routes/api/v1/comment/[id]/+server.ts
@@ -1,6 +1,5 @@
 import { CommentUpdateSchema } from "$lib/models/api/comment_schema";
 import type { Comment } from "$lib/models/comment";
-import { pb } from "$lib/pocketbase";
 import { Collection, handleError, remove, show, update } from "$lib/util/api_util";
 import { json, type RequestEvent } from "@sveltejs/kit";
 
@@ -10,7 +9,7 @@ export async function GET(event: RequestEvent) {
         if (!r.expand) {
             r.expand = {} as any
         }
-        r.expand!.author = await pb.collection('users_anonymous').getOne(r.author)
+        r.expand!.author = await event.locals.pb.collection('users_anonymous').getOne(r.author)
 
         return json(r)
     } catch (e: any) {
diff --git a/web/src/routes/api/v1/files/[collection]/[record]/[file]/+server.ts b/web/src/routes/api/v1/files/[collection]/[record]/[file]/+server.ts
index af146c28..4ca6c077 100644
--- a/web/src/routes/api/v1/files/[collection]/[record]/[file]/+server.ts
+++ b/web/src/routes/api/v1/files/[collection]/[record]/[file]/+server.ts
@@ -1,4 +1,3 @@
-import { pb } from "$lib/pocketbase";
 import { error, type RequestEvent } from "@sveltejs/kit";
 import { z } from "zod";
 
@@ -21,7 +20,7 @@ export async function GET(event: RequestEvent) {
     parts.push(encodeURIComponent(safeParams.data.record));
     parts.push(encodeURIComponent(safeParams.data.file));
 
-    let fileURL = pb.buildURL(parts.join("/"));
+    let fileURL = event.locals.pb.buildURL(parts.join("/"));
 
     try {
         const r = await event.fetch(fileURL)
diff --git a/web/src/routes/api/v1/follow/+server.ts b/web/src/routes/api/v1/follow/+server.ts
index 870cf7af..f145a38d 100644
--- a/web/src/routes/api/v1/follow/+server.ts
+++ b/web/src/routes/api/v1/follow/+server.ts
@@ -1,7 +1,6 @@
 import { FollowCreateSchema } from '$lib/models/api/follow_schema';
 import type { Follow } from '$lib/models/follow';
 import type { UserAnonymous } from '$lib/models/user';
-import { pb } from '$lib/pocketbase';
 import { Collection, create, handleError, list } from '$lib/util/api_util';
 import { json, type RequestEvent } from '@sveltejs/kit';
 
@@ -9,8 +8,8 @@ export async function GET(event: RequestEvent) {
     try {
         const r = await list<Follow>(event, Collection.follows);
         for (const follow of r.items) {
-            const follower = await pb.collection('users_anonymous').getOne<UserAnonymous>(follow.follower, { requestKey: null })
-            const followee = await pb.collection('users_anonymous').getOne<UserAnonymous>(follow.followee, { requestKey: null })
+            const follower = await event.locals.pb.collection('users_anonymous').getOne<UserAnonymous>(follow.follower, { requestKey: null })
+            const followee = await event.locals.pb.collection('users_anonymous').getOne<UserAnonymous>(follow.followee, { requestKey: null })
             follow.expand = {
                 follower, followee
             }
diff --git a/web/src/routes/api/v1/integration/komoot/login/+server.ts b/web/src/routes/api/v1/integration/komoot/login/+server.ts
index 385b89e4..0fe3711e 100644
--- a/web/src/routes/api/v1/integration/komoot/login/+server.ts
+++ b/web/src/routes/api/v1/integration/komoot/login/+server.ts
@@ -1,10 +1,9 @@
-import { pb } from "$lib/pocketbase";
 import { handleError } from "$lib/util/api_util";
-import { json } from "@sveltejs/kit";
+import { json, type RequestEvent } from "@sveltejs/kit";
 
-export async function GET() {
+export async function GET(event: RequestEvent) {
     try {
-        const r = await pb.send("/integration/komoot/login", {
+        const r = await event.locals.pb.send("/integration/komoot/login", {
             method: "GET",
         });
         return json(r);
diff --git a/web/src/routes/api/v1/list-share/+server.ts b/web/src/routes/api/v1/list-share/+server.ts
index 64d5d771..b7142ea4 100644
--- a/web/src/routes/api/v1/list-share/+server.ts
+++ b/web/src/routes/api/v1/list-share/+server.ts
@@ -1,16 +1,15 @@
 import { ListShareCreateSchema } from '$lib/models/api/list_share_schema';
 import type { ListShare } from '$lib/models/list_share';
 import type { User } from '$lib/models/user';
-import { pb } from '$lib/pocketbase';
 import { Collection, create, handleError, list } from '$lib/util/api_util';
-import { error, json, type RequestEvent } from '@sveltejs/kit';
+import { json, type RequestEvent } from '@sveltejs/kit';
 
 export async function GET(event: RequestEvent) {
     try {
         const r = await list<ListShare>(event, Collection.list_share);
 
         for (const share of r.items) {
-            const anonymous_user = await pb.collection('users_anonymous').getOne<User>(share.user)
+            const anonymous_user = await event.locals.pb.collection('users_anonymous').getOne<User>(share.user)
             share.expand = {
                 user: anonymous_user
             }
diff --git a/web/src/routes/api/v1/list/+server.ts b/web/src/routes/api/v1/list/+server.ts
index 37adc929..115d1aad 100644
--- a/web/src/routes/api/v1/list/+server.ts
+++ b/web/src/routes/api/v1/list/+server.ts
@@ -1,6 +1,5 @@
 import { ListCreateSchema } from '$lib/models/api/list_schema';
 import type { List } from '$lib/models/list';
-import { pb } from '$lib/pocketbase';
 import { Collection, create, handleError, list } from '$lib/util/api_util';
 import { json, type RequestEvent } from '@sveltejs/kit';
 
@@ -8,13 +7,13 @@ export async function GET(event: RequestEvent) {
     try {
         const r = await list<List>(event, Collection.lists);
         for (const t of r.items) {
-            if (!t.author || !pb.authStore.record) {
+            if (!t.author || !event.locals.pb.authStore.record) {
                 continue;
             }
             if (!t.expand) {
                 t.expand = {}
             }
-            t.expand!.author = await pb.collection("users_anonymous").getOne(t.author);
+            t.expand!.author = await event.locals.pb.collection("users_anonymous").getOne(t.author);
         }
         return json(r)
     } catch (e) {
diff --git a/web/src/routes/api/v1/list/[id]/+server.ts b/web/src/routes/api/v1/list/[id]/+server.ts
index 9ce1d872..53bc8d9d 100644
--- a/web/src/routes/api/v1/list/[id]/+server.ts
+++ b/web/src/routes/api/v1/list/[id]/+server.ts
@@ -1,6 +1,5 @@
 import { ListUpdateSchema } from "$lib/models/api/list_schema";
 import type { List } from "$lib/models/list";
-import { pb } from "$lib/pocketbase";
 import { Collection, handleError, remove, show, update } from "$lib/util/api_util";
 import { json, type RequestEvent } from "@sveltejs/kit";
 
@@ -10,7 +9,7 @@ export async function GET(event: RequestEvent) {
         if (!r.expand) {
             r.expand = {} as any
         }
-        r.expand!.author = await pb.collection('users_anonymous').getOne(r.author!)
+        r.expand!.author = await event.locals.pb.collection('users_anonymous').getOne(r.author!)
 
         return json(r)
     } catch (e: any) {
diff --git a/web/src/routes/api/v1/list/[id]/file/+server.ts b/web/src/routes/api/v1/list/[id]/file/+server.ts
index 4b83ab52..fa01f215 100644
--- a/web/src/routes/api/v1/list/[id]/file/+server.ts
+++ b/web/src/routes/api/v1/list/[id]/file/+server.ts
@@ -1,4 +1,3 @@
-import { pb } from "$lib/pocketbase";
 import { Collection, handleError, upload } from "$lib/util/api_util";
 import { json, type RequestEvent } from "@sveltejs/kit";
 import type { List } from "postcss/lib/list";
diff --git a/web/src/routes/api/v1/notification/+server.ts b/web/src/routes/api/v1/notification/+server.ts
index cac8697d..7cf40172 100644
--- a/web/src/routes/api/v1/notification/+server.ts
+++ b/web/src/routes/api/v1/notification/+server.ts
@@ -1,16 +1,15 @@
 import type { Notification } from '$lib/models/notification';
 import type { UserAnonymous } from '$lib/models/user';
-import { pb } from '$lib/pocketbase';
 import { Collection, handleError, list } from '$lib/util/api_util';
-import { error, json, type RequestEvent } from '@sveltejs/kit';
+import { json, type RequestEvent } from '@sveltejs/kit';
 
 export async function GET(event: RequestEvent) {
     try {
         const r = await list<Notification>(event, Collection.notifications);
 
         for (const notification of r.items) {
-            const recipient = await pb.collection('users_anonymous').getOne<UserAnonymous>(notification.recipient, { requestKey: null })
-            const author = await pb.collection('users_anonymous').getOne<UserAnonymous>(notification.author, { requestKey: null })
+            const recipient = await event.locals.pb.collection('users_anonymous').getOne<UserAnonymous>(notification.recipient, { requestKey: null })
+            const author = await event.locals.pb.collection('users_anonymous').getOne<UserAnonymous>(notification.author, { requestKey: null })
             notification.expand = {
                 recipient, author
             }
diff --git a/web/src/routes/api/v1/settings/[id]/+server.ts b/web/src/routes/api/v1/settings/[id]/+server.ts
index 15dfbdff..e77a5168 100644
--- a/web/src/routes/api/v1/settings/[id]/+server.ts
+++ b/web/src/routes/api/v1/settings/[id]/+server.ts
@@ -1,8 +1,7 @@
 import { SettingsCreateSchema } from '$lib/models/api/settings_schema';
 import type { Settings } from "$lib/models/settings";
-import { pb } from "$lib/pocketbase";
 import { Collection, handleError, remove, show, update } from "$lib/util/api_util";
-import { error, json, type RequestEvent } from "@sveltejs/kit";
+import { json, type RequestEvent } from "@sveltejs/kit";
 
 
 export async function GET(event: RequestEvent) {
diff --git a/web/src/routes/api/v1/summit-log/[id]/+server.ts b/web/src/routes/api/v1/summit-log/[id]/+server.ts
index 35c85b00..79588a6c 100644
--- a/web/src/routes/api/v1/summit-log/[id]/+server.ts
+++ b/web/src/routes/api/v1/summit-log/[id]/+server.ts
@@ -1,6 +1,5 @@
 import { SummitLogUpdateSchema } from "$lib/models/api/summit_log_schema";
 import type { SummitLog } from "$lib/models/summit_log";
-import { pb } from "$lib/pocketbase";
 import { Collection, handleError, remove, show, update } from "$lib/util/api_util";
 import { error, json, type RequestEvent } from "@sveltejs/kit";
 
@@ -12,7 +11,7 @@ export async function GET(event: RequestEvent) {
         if (!r.expand) {
             r.expand = {} as any
         }
-        r.expand!.author = await pb.collection("users_anonymous").getOne(r.author!);
+        r.expand!.author = await event.locals.pb.collection("users_anonymous").getOne(r.author!);
 
         return json(r)
     } catch (e: any) {
diff --git a/web/src/routes/api/v1/trail-share/+server.ts b/web/src/routes/api/v1/trail-share/+server.ts
index 7e4634cf..906edec5 100644
--- a/web/src/routes/api/v1/trail-share/+server.ts
+++ b/web/src/routes/api/v1/trail-share/+server.ts
@@ -1,7 +1,6 @@
 import { TrailShareCreateSchema } from '$lib/models/api/trail_share_schema';
 import type { TrailShare } from '$lib/models/trail_share';
 import type { UserAnonymous } from '$lib/models/user';
-import { pb } from '$lib/pocketbase';
 import { Collection, handleError, list, create } from '$lib/util/api_util';
 import { json, type RequestEvent } from '@sveltejs/kit';
 
@@ -9,7 +8,7 @@ export async function GET(event: RequestEvent) {
     try {
         const r = await list<TrailShare>(event, Collection.trail_share);
         for (const share of r.items) {
-            const anonymous_user = await pb.collection('users_anonymous').getOne<UserAnonymous>(share.user)
+            const anonymous_user = await event.locals.pb.collection('users_anonymous').getOne<UserAnonymous>(share.user)
             share.expand = {
                 user: anonymous_user
             }
diff --git a/web/src/routes/api/v1/trail/+server.ts b/web/src/routes/api/v1/trail/+server.ts
index d78164a3..7af8a36d 100644
--- a/web/src/routes/api/v1/trail/+server.ts
+++ b/web/src/routes/api/v1/trail/+server.ts
@@ -1,6 +1,5 @@
 import { TrailCreateSchema } from '$lib/models/api/trail_schema';
 import type { Trail } from '$lib/models/trail';
-import { pb } from '$lib/pocketbase';
 import { Collection, create, handleError, list } from '$lib/util/api_util';
 import { json, type RequestEvent } from '@sveltejs/kit';
 
@@ -9,14 +8,13 @@ export async function GET(event: RequestEvent) {
         const r = await list<Trail>(event, Collection.trails);
 
         for (const t of r.items) {
-            if (!t.author || !pb.authStore.record) {
+            if (!t.author || !event.locals.pb.authStore.record) {
                 continue;
             }
             if (!t.expand) {
                 t.expand = {} as any
             }
 
-            // t.expand!.author = await pb.collection("users_anonymous").getOne(t.author);
             t.expand?.waypoints?.sort((a, b) => (a.distance_from_start ?? 0) - (b.distance_from_start ?? 0))
         }
         return json(r)
diff --git a/web/src/routes/api/v1/trail/[id]/+server.ts b/web/src/routes/api/v1/trail/[id]/+server.ts
index b3beed77..f736b4a5 100644
--- a/web/src/routes/api/v1/trail/[id]/+server.ts
+++ b/web/src/routes/api/v1/trail/[id]/+server.ts
@@ -1,22 +1,22 @@
 import type { Trail } from "$lib/models/trail";
-import { pb } from "$lib/pocketbase";
 import { Collection, handleError, remove, show, update } from "$lib/util/api_util";
 import { error, json, type RequestEvent } from "@sveltejs/kit";
 import { TrailUpdateSchema } from '$lib/models/api/trail_schema';
+import type PocketBase from "pocketbase";
 
 export async function GET(event: RequestEvent) {
     try {
         const r = await show<Trail>(event, Collection.trails)
 
-        if (pb.authStore.record) {
+        if (event.locals.pb.authStore.record) {
             if (!r.expand) {
                 r.expand = {} as any
             }
-            r.expand!.author = await pb.collection("users_anonymous").getOne(r.author!);
+            r.expand!.author = await event.locals.pb.collection("users_anonymous").getOne(r.author!);
         }
 
         // remove time from dates
-        await enrichRecord(r);
+        await enrichRecord(event.locals.pb, r);
 
         // sort waypoints by distance
         r.expand?.waypoints?.sort((a, b) => (a.distance_from_start ?? 0) - (b.distance_from_start ?? 0))
@@ -29,7 +29,7 @@ export async function GET(event: RequestEvent) {
 export async function POST(event: RequestEvent) {
     try {
         const r = await update<Trail>(event, TrailUpdateSchema, Collection.trails)
-        await enrichRecord(r)
+        await enrichRecord(event.locals.pb, r)
         return json(r);
     } catch (e: any) {
         throw handleError(e)
@@ -47,7 +47,7 @@ export async function DELETE(event: RequestEvent) {
 
 
 
-async function enrichRecord(r: Trail) {
+async function enrichRecord(pb: PocketBase, r: Trail) {
     r.date = r.date?.substring(0, 10) ?? "";
     for (const log of r.expand?.summit_logs ?? []) {
         log.date = log.date.substring(0, 10);
diff --git a/web/src/routes/api/v1/trail/bounding-box/+server.ts b/web/src/routes/api/v1/trail/bounding-box/+server.ts
index 0cdb648d..4b857ed7 100644
--- a/web/src/routes/api/v1/trail/bounding-box/+server.ts
+++ b/web/src/routes/api/v1/trail/bounding-box/+server.ts
@@ -1,10 +1,9 @@
 import { type TrailBoundingBox, type TrailFilterValues } from '$lib/models/trail';
-import { pb } from '$lib/pocketbase';
 import { handleError } from '$lib/util/api_util';
 import { error, json, type RequestEvent } from '@sveltejs/kit';
 
 export async function GET(event: RequestEvent) {
-    if (!pb.authStore.record) {
+    if (!event.locals.pb.authStore.record) {
         return json({
             max_lat: 0,
             min_lat: 0,
@@ -13,7 +12,7 @@ export async function GET(event: RequestEvent) {
         });
     }
     try {
-        const r = await pb.collection('trails_bounding_box').getOne<TrailBoundingBox>(pb.authStore.record!.id)
+        const r = await event.locals.pb.collection('trails_bounding_box').getOne<TrailBoundingBox>(event.locals.pb.authStore.record!.id)
         return json(r)
     } catch (e: any) {
         throw handleError(e);
diff --git a/web/src/routes/api/v1/trail/filter/+server.ts b/web/src/routes/api/v1/trail/filter/+server.ts
index 7f947013..275ef0fa 100644
--- a/web/src/routes/api/v1/trail/filter/+server.ts
+++ b/web/src/routes/api/v1/trail/filter/+server.ts
@@ -1,10 +1,9 @@
 import { type TrailFilterValues } from '$lib/models/trail';
-import { pb } from '$lib/pocketbase';
 import { handleError } from '$lib/util/api_util';
-import { error, json, type RequestEvent } from '@sveltejs/kit';
+import { json, type RequestEvent } from '@sveltejs/kit';
 
 export async function GET(event: RequestEvent) {
-    if (!pb.authStore.record) {
+    if (!event.locals.pb.authStore.record) {
         return json({
             min_distance: 0,
             max_distance: 20000,
@@ -15,7 +14,7 @@ export async function GET(event: RequestEvent) {
         });
     }
     try {
-        const r = await pb.collection('trails_filter').getOne<TrailFilterValues>(pb.authStore.record!.id)
+        const r = await event.locals.pb.collection('trails_filter').getOne<TrailFilterValues>(event.locals.pb.authStore.record!.id)
         return json(r)
     } catch (e: any) {
         throw handleError(e);
diff --git a/web/src/routes/api/v1/trail/recommend/+server.ts b/web/src/routes/api/v1/trail/recommend/+server.ts
index 50875561..f3ff3fd0 100644
--- a/web/src/routes/api/v1/trail/recommend/+server.ts
+++ b/web/src/routes/api/v1/trail/recommend/+server.ts
@@ -1,6 +1,5 @@
 import { TrailRecommendSchema } from '$lib/models/api/trail_schema';
 import type { Trail } from '$lib/models/trail';
-import { pb } from '$lib/pocketbase';
 import { handleError } from '$lib/util/api_util';
 import { json, type RequestEvent } from '@sveltejs/kit';
 
@@ -9,7 +8,7 @@ export async function GET(event: RequestEvent) {
         const searchParams = Object.fromEntries(event.url.searchParams);
         const safeSearchParams = TrailRecommendSchema.parse(searchParams);
         
-        const r = await pb.send("/trail/recommend?" + new URLSearchParams({
+        const r = await event.locals.pb.send("/trail/recommend?" + new URLSearchParams({
             size: safeSearchParams.size?.toString() ?? ""
         }), {
             method: "GET",
@@ -18,13 +17,13 @@ export async function GET(event: RequestEvent) {
         const result: Trail[] = r;
 
         for (const t of result) {
-            if (!t.author || !pb.authStore.record) {
+            if (!t.author || !event.locals.pb.authStore.record) {
                 continue;
             }
             if (!t.expand) {
                 t.expand = {} as any
             }
-            t.expand!.author = await pb.collection("users_anonymous").getOne(t.author);
+            t.expand!.author = await event.locals.pb.collection("users_anonymous").getOne(t.author);
         }
 
         return json(result)
diff --git a/web/src/routes/api/v1/trail/upload/+server.ts b/web/src/routes/api/v1/trail/upload/+server.ts
index 5332638e..93e40051 100644
--- a/web/src/routes/api/v1/trail/upload/+server.ts
+++ b/web/src/routes/api/v1/trail/upload/+server.ts
@@ -1,13 +1,12 @@
 import GPX from "$lib/models/gpx/gpx";
 import { haversineDistance } from "$lib/models/gpx/utils";
-import { SummitLog } from "$lib/models/summit_log";
 import type { Trail } from "$lib/models/trail";
-import { pb } from "$lib/pocketbase";
-import { fetchGPX, trails_create } from "$lib/stores/trail_store";
+import { trails_create } from "$lib/stores/trail_store";
 import { handleError } from "$lib/util/api_util";
 import { fromFile, gpx2trail } from "$lib/util/gpx_util";
 import { json, type RequestEvent } from "@sveltejs/kit";
 import { ClientResponseError } from "pocketbase";
+import type PocketBase from 'pocketbase';
 
 export async function PUT(event: RequestEvent) {
     try {
@@ -31,7 +30,7 @@ export async function PUT(event: RequestEvent) {
         if (!ignoreDuplicates) {
             let duplicate: Trail | null = null;
             try {
-                duplicate = await findDuplicate(trail)
+                duplicate = await findDuplicate(event.locals.pb, trail)
             } catch (e: any) {
                 throw new ClientResponseError({ status: 500, response: { message: "Error checking for duplicates" } })
             }
@@ -66,7 +65,7 @@ export async function PUT(event: RequestEvent) {
     }
 }
 
-async function findDuplicate(t1: Trail) {
+async function findDuplicate(pb: PocketBase, t1: Trail) {
     const trails: Trail[] = await pb.collection('trails').getFullList({ requestKey: null });
 
     const distanceThreshold = 100;
diff --git a/web/src/routes/api/v1/user/+server.ts b/web/src/routes/api/v1/user/+server.ts
index 8ffa6a34..31a8c90d 100644
--- a/web/src/routes/api/v1/user/+server.ts
+++ b/web/src/routes/api/v1/user/+server.ts
@@ -1,8 +1,7 @@
 import { env } from '$env/dynamic/public';
 import { UserCreateSchema } from '$lib/models/api/user_schema';
 import type { User } from '$lib/models/user';
-import { pb } from '$lib/pocketbase';
-import { Collection, create, handleError } from '$lib/util/api_util';
+import { Collection, handleError } from '$lib/util/api_util';
 import { json, type RequestEvent } from '@sveltejs/kit';
 import { ClientResponseError } from 'pocketbase';
 
@@ -16,9 +15,9 @@ export async function PUT(event: RequestEvent) {
         const data = await event.request.json();
         const safeData = UserCreateSchema.parse(data);
 
-        const r = await pb.collection(Collection.users).create<User>(safeData)
+        const r = await event.locals.pb.collection(Collection.users).create<User>(safeData)
 
-        await pb.collection('users').requestVerification(safeData.email);
+        await event.locals.pb.collection('users').requestVerification(safeData.email);
 
         return json(r);
     } catch (e: any) {
diff --git a/web/src/routes/api/v1/user/[id]/+server.ts b/web/src/routes/api/v1/user/[id]/+server.ts
index ac834537..a646a90b 100644
--- a/web/src/routes/api/v1/user/[id]/+server.ts
+++ b/web/src/routes/api/v1/user/[id]/+server.ts
@@ -1,9 +1,8 @@
 import { RecordIdSchema } from '$lib/models/api/base_schema';
 import { UserUpdateSchema } from '$lib/models/api/user_schema';
 import type { User } from '$lib/models/user';
-import { pb } from '$lib/pocketbase';
 import { Collection, handleError, remove, show } from '$lib/util/api_util';
-import { error, json, type RequestEvent } from '@sveltejs/kit'
+import { json, type RequestEvent } from '@sveltejs/kit';
 
 export async function GET(event: RequestEvent) {
     try {
@@ -23,13 +22,13 @@ export async function POST(event: RequestEvent) {
 
         const safeData = UserUpdateSchema.parse(data);
 
-        if (safeData.email && safeData.email != pb.authStore.record!.email) {
-            const r = await pb.collection('users').requestEmailChange(safeData.email);
-            pb.authStore.record!.email = safeData.email;
+        if (safeData.email && safeData.email != event.locals.pb.authStore.record!.email) {
+            const r = await event.locals.pb.collection('users').requestEmailChange(safeData.email);
+            event.locals.pb.authStore.record!.email = safeData.email;
         }
-        const r = await pb.collection('users').update<User>(safeParams.id, safeData)
+        const r = await event.locals.pb.collection('users').update<User>(safeParams.id, safeData)
         if (safeData.password) {
-            const r = await pb.collection('users').authWithPassword(safeData.email ?? safeData.username!, safeData.password);
+            const r = await event.locals.pb.collection('users').authWithPassword(safeData.email ?? safeData.username!, safeData.password);
             return json(r.record)
         } else {
             return json(r);
diff --git a/web/src/routes/api/v1/user/anonymous/+server.ts b/web/src/routes/api/v1/user/anonymous/+server.ts
index 4472f6f8..e01e1740 100644
--- a/web/src/routes/api/v1/user/anonymous/+server.ts
+++ b/web/src/routes/api/v1/user/anonymous/+server.ts
@@ -1,5 +1,4 @@
 import type { UserAnonymous } from '$lib/models/user';
-import { pb } from '$lib/pocketbase';
 import { Collection, handleError, list } from '$lib/util/api_util';
 import { json, type RequestEvent } from '@sveltejs/kit';
 
diff --git a/web/src/routes/auth/confirm-verification/[token]/+page.server.ts b/web/src/routes/auth/confirm-verification/[token]/+page.server.ts
index aaa769e1..55135378 100644
--- a/web/src/routes/auth/confirm-verification/[token]/+page.server.ts
+++ b/web/src/routes/auth/confirm-verification/[token]/+page.server.ts
@@ -1,4 +1,3 @@
-import { pb } from "$lib/pocketbase";
 import { Collection } from "$lib/util/api_util";
 import { error, type ServerLoad } from "@sveltejs/kit";
 import { ClientResponseError } from "pocketbase";
@@ -9,7 +8,7 @@ export const load: ServerLoad = async ({ params, locals, url, fetch }) => {
     }
 
     try {
-        await pb.collection(Collection.users).confirmVerification(params.token)
+        await locals.pb.collection(Collection.users).confirmVerification(params.token)
     } catch (e) {
         if (e instanceof ClientResponseError) {
             error(400, e.message);
diff --git a/web/src/routes/settings/integrations/+page.svelte b/web/src/routes/settings/integrations/+page.svelte
index fff5751d..9ca4720d 100644
--- a/web/src/routes/settings/integrations/+page.svelte
+++ b/web/src/routes/settings/integrations/+page.svelte
@@ -5,11 +5,9 @@
     import StravaSettingsModal from "$lib/components/settings/integrations/strava_settings_modal.svelte";
     import {
         Integration,
-        type BaseIntegration,
         type KomootIntegration,
-        type StravaIntegration,
+        type StravaIntegration
     } from "$lib/models/integration.js";
-    import { pb } from "$lib/pocketbase.js";
     import {
         integrations_create,
         integrations_update,
diff --git a/web/src/routes/settings/integrations/callback/strava/+page.server.ts b/web/src/routes/settings/integrations/callback/strava/+page.server.ts
index ac241b16..b7853de9 100644
--- a/web/src/routes/settings/integrations/callback/strava/+page.server.ts
+++ b/web/src/routes/settings/integrations/callback/strava/+page.server.ts
@@ -1,9 +1,7 @@
-import { pb } from "$lib/pocketbase";
-import { integrations_index, integrations_update } from "$lib/stores/integration_store";
-import { error, redirect, type RequestEvent, type ServerLoad } from "@sveltejs/kit";
+import { error, redirect, type ServerLoad } from "@sveltejs/kit";
 import { ClientResponseError } from "pocketbase";
 
-export const load: ServerLoad = async ({ url, fetch }) => {
+export const load: ServerLoad = async ({ url, fetch, locals }) => {
     const oauthError = url.searchParams.get('error');
     if (oauthError) {
         // user cancelled
@@ -22,7 +20,7 @@ export const load: ServerLoad = async ({ url, fetch }) => {
     }
 
     try {
-        await pb.send("/integration/strava/token", {
+        await locals.pb.send("/integration/strava/token", {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify({
diff --git a/web/src/routes/trail/edit/[id]/+page.ts b/web/src/routes/trail/edit/[id]/+page.ts
index cd447e3c..b3f9ff93 100644
--- a/web/src/routes/trail/edit/[id]/+page.ts
+++ b/web/src/routes/trail/edit/[id]/+page.ts
@@ -1,18 +1,21 @@
 import { ExpandType } from "$lib/models/list";
 import { Trail } from "$lib/models/trail";
-import { pb } from "$lib/pocketbase";
 import { categories_index } from "$lib/stores/category_store";
 import { lists_index } from "$lib/stores/list_store";
 import { trails_show } from "$lib/stores/trail_store";
+import { currentUser } from "$lib/stores/user_store";
 import { error, type Load } from "@sveltejs/kit";
+import { get } from "svelte/store";
 
 export const load: Load = async ({ params, fetch }) => {
+    const user = get(currentUser)
+   
     if (!params.id) {
         return error(400, "Bad Request")
     }
     const categories = await categories_index(fetch)
-    const lists = await lists_index({ q: "", author: pb.authStore.record?.id ?? "" }, 1, -1, fetch, ExpandType.None)
-    
+    const lists = await lists_index({ q: "", author: user?.id ?? "" }, 1, -1, fetch, ExpandType.None)
+
     let trail: Trail;
     if (params.id === "new") {
         trail = new Trail("", { category: categories[0] });
diff --git a/web/static/styles/osm.json b/web/static/styles/osm.json
index 328b6ae8..39c2504f 100644
--- a/web/static/styles/osm.json
+++ b/web/static/styles/osm.json
@@ -9,6 +9,7 @@
             "tileSize": 256
         }
     },
+    "glyphs": "https://tiles.basemaps.cartocdn.com/fonts/{fontstack}/{range}.pbf",
     "layers": [
         {
             "id": "osm-tiles",
diff --git a/web/static/styles/otm.json b/web/static/styles/otm.json
index b071b1d2..f2a058ab 100644
--- a/web/static/styles/otm.json
+++ b/web/static/styles/otm.json
@@ -9,6 +9,7 @@
             "tileSize": 256
         }
     },
+    "glyphs": "https://tiles.basemaps.cartocdn.com/fonts/{fontstack}/{range}.pbf",
     "layers": [
         {
             "id": "osm-tiles",