diff --git a/package-lock.json b/package-lock.json
index 5a9bd0b0..e3b1269f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -53,7 +53,7 @@
         "tailwindcss": "^3.4.10",
         "tslib": "^2.4.1",
         "typescript": "^5.0.0",
-        "typescript-svelte-plugin": "^0.3.42",
+        "typescript-svelte-plugin": "^0.3.43",
         "vite": "^5.4.0",
         "vite-plugin-tailwind-purgecss": "^0.3.3",
         "vitest": "^2.1.0"
diff --git a/package.json b/package.json
index c4086d5e..9bc7d27a 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "tailwindcss": "^3.4.10",
     "tslib": "^2.4.1",
     "typescript": "^5.0.0",
-    "typescript-svelte-plugin": "^0.3.42",
+    "typescript-svelte-plugin": "^0.3.43",
     "vite": "^5.4.0",
     "vite-plugin-tailwind-purgecss": "^0.3.3",
     "vitest": "^2.1.0"
diff --git a/src/routes/events/[event_id]/session/[session_id]/session_page_menu.svelte b/src/routes/events/[event_id]/session/[session_id]/session_page_menu.svelte
index a97e17a3..1f79492d 100644
--- a/src/routes/events/[event_id]/session/[session_id]/session_page_menu.svelte
+++ b/src/routes/events/[event_id]/session/[session_id]/session_page_menu.svelte
@@ -41,8 +41,8 @@ let ae_triggers: key_val = {};
         event_id={$lq__event_session_obj?.event_id}
         events__reports={$lq__event_session_obj?.event_id && $ae_loc.trusted_access}
         events__session_search={$lq__event_session_obj?.event_id}
-        events__launcher_id={$lq__event_session_obj?.event_location_id && $ae_loc.administrator_access}
-        events__location_id={$lq__event_session_obj?.event_location_id && $ae_loc.trusted_access}
+        events__launcher_id={(($lq__event_session_obj?.event_location_id && $ae_loc.administrator_access) ? $lq__event_session_obj?.event_location_id : null)}
+        events__location_id={(($lq__event_session_obj?.event_location_id && $ae_loc.trusted_access) ? $lq__event_session_obj?.event_location_id : null)}
         events__locations={$ae_loc.administrator_access}
         />
 
diff --git a/src/routes/events/ae_comp__events_menu_nav.svelte b/src/routes/events/ae_comp__events_menu_nav.svelte
index 076988ec..559cc7df 100644
--- a/src/routes/events/ae_comp__events_menu_nav.svelte
+++ b/src/routes/events/ae_comp__events_menu_nav.svelte
@@ -1,18 +1,18 @@
 <script lang="ts">
 import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores';
-import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores';
+// import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores';
 
 export let hide: boolean = true;
 
 export let event_id: null|string = null;
 
 export let ae_core: boolean = false;
-export let events__launcher_id: boolean = false; // event_location_id
-export let events__location_id: boolean = false; // event_location_id
+export let events__launcher_id: null|string = null; // event_location_id
+export let events__location_id: null|string = null; // event_location_id
 export let events__locations: boolean = false; // event_id
-export let events__presenter_id: boolean = false; // event_presenter_id
+// export let events__presenter_id: null|string = null; // event_presenter_id
 export let events__reports: boolean = false; // event_id
-export let events__session_id: boolean = false; // event_session_id
+export let events__session_id: null|string = null; // event_session_id
 export let events__session_search: boolean = false; // event_id