diff --git a/src/lib/ae_api/api_get_object.ts b/src/lib/ae_api/api_get_object.ts
index 95d36a4d..7c925f74 100644
--- a/src/lib/ae_api/api_get_object.ts
+++ b/src/lib/ae_api/api_get_object.ts
@@ -57,6 +57,10 @@ export const get_object = async function get_object({
         return false;
     }
 
+    if (!filename && params.filename) {
+        filename = params.filename;
+    }
+
     const url = new URL(endpoint, api_cfg['base_url']);
     Object.keys(params).forEach((key) => url.searchParams.append(key, params[key]));
 
diff --git a/src/lib/ae_core/ae_comp__hosted_files_download_button.svelte b/src/lib/ae_core/ae_comp__hosted_files_download_button.svelte
index 2cf64539..f33a442c 100644
--- a/src/lib/ae_core/ae_comp__hosted_files_download_button.svelte
+++ b/src/lib/ae_core/ae_comp__hosted_files_download_button.svelte
@@ -280,6 +280,7 @@
     {#if show_direct_download}
         <a
             href={direct_download_url}
+            download={ae_util.clean_filename(final_filename)}
             class={variant_classes}
             title={`Direct download (V3 Action):\n${final_filename}\n[API] SHA256: ${hosted_file_obj?.hash_sha256?.slice(0, 10)}...\nHosted ID: ${file_id}`}
         >
diff --git a/src/routes/events/[event_id]/(launcher)/+layout.svelte b/src/routes/events/[event_id]/(launcher)/+layout.svelte
index fab43c0f..8fcaab3d 100644
--- a/src/routes/events/[event_id]/(launcher)/+layout.svelte
+++ b/src/routes/events/[event_id]/(launcher)/+layout.svelte
@@ -4,8 +4,8 @@
      * Root layout for the launcher area.
      * Ensures background sync runs globally regardless of active tab.
      */
-    import { ae_loc } from '$lib/stores/ae_stores';
-    import LauncherBackgroundSync from './launcher_background_sync.svelte';
+    // import { ae_loc } from '$lib/stores/ae_stores';
+    import Launcher_Background_Sync from './launcher_background_sync.svelte';
 
     interface Props {
         children?: import('svelte').Snippet;
@@ -15,7 +15,7 @@
 </script>
 
 <!-- Background Sync Process (Invisible) -->
-<LauncherBackgroundSync log_lvl={1} />
+<Launcher_Background_Sync log_lvl={1} />
 
 <!-- Render the rest of the launcher UI -->
 {@render children?.()}
diff --git a/src/routes/events/[event_id]/(launcher)/launcher/+layout.svelte b/src/routes/events/[event_id]/(launcher)/launcher/+layout.svelte
index 06116508..6a7811d6 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher/+layout.svelte
+++ b/src/routes/events/[event_id]/(launcher)/launcher/+layout.svelte
@@ -272,6 +272,7 @@
                         filename: obj_filename,
                         key: $ae_api.account_id
                     },
+                    filename: obj_filename,
                     return_blob: true,
                     auto_download: true,
                     log_lvl: 1
diff --git a/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte b/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte
index e4072e43..0e127cf1 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte
+++ b/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte
@@ -178,6 +178,7 @@
                     filename: filename,
                     x_no_account_id_token: 'direct-download'
                 },
+                filename: filename,
                 return_blob: true,
                 auto_download: true,
                 log_lvl: 1
@@ -199,6 +200,7 @@
                     filename: event_file_obj.filename,
                     x_no_account_id_token: 'direct-download'
                 },
+                filename: event_file_obj.filename,
                 return_blob: true,
                 auto_download: true,
                 log_lvl: 1
diff --git a/src/routes/events/[event_id]/(launcher)/launcher_menu.svelte b/src/routes/events/[event_id]/(launcher)/launcher_menu.svelte
index d8bb5dd3..1e342223 100644
--- a/src/routes/events/[event_id]/(launcher)/launcher_menu.svelte
+++ b/src/routes/events/[event_id]/(launcher)/launcher_menu.svelte
@@ -1,7 +1,5 @@
 <script lang="ts">
     interface Props {
-        data_url: any;
-
         lq__event_obj: any;
 
         lq__event_event_file_obj_li: any;
@@ -28,8 +26,6 @@
     }
 
     let {
-        data_url,
-
         lq__event_obj,
 
         lq__event_event_file_obj_li,
@@ -168,7 +164,6 @@
 
     {#if $ae_loc.edit_mode}
         <Menu_location_list_menu
-            {data_url}
             {lq__event_location_obj_li}
             slct_event_location_id={$events_slct.event_location_id}
             bind:loading__session_li_status
@@ -213,7 +208,6 @@
 
     {#if $lq__event_session_obj_li}
         <Menu_session_list_menu
-            {data_url}
             bind:slct__event_session_id
             bind:loading__session_id_status
             {lq__event_session_obj_li}
diff --git a/src/routes/events/[event_id]/(launcher)/menu_location_list.svelte b/src/routes/events/[event_id]/(launcher)/menu_location_list.svelte
index 8328c53f..c2bb8acd 100644
--- a/src/routes/events/[event_id]/(launcher)/menu_location_list.svelte
+++ b/src/routes/events/[event_id]/(launcher)/menu_location_list.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
     interface Props {
-        data_url: any;
         loading__session_li_status?: null | boolean | string;
         lq__event_location_obj_li: any;
         slct_event_location_id: string | null;
@@ -12,7 +11,6 @@
     }
 
     let {
-        data_url,
         loading__session_li_status = $bindable(null),
         lq__event_location_obj_li,
         slct_event_location_id = null,
@@ -24,6 +22,7 @@
     }: Props = $props();
 
     // *** Import Svelte specific
+    import { page } from '$app/state';
     import { goto } from '$app/navigation';
     // import { liveQuery } from "dexie";
     // import { tick } from 'svelte';
@@ -156,13 +155,14 @@
                 loading__session_li_status = true;
 
                 console.log('Remove fields from the URL.');
-                // data_url.searchParams.delete('location_id');
-                data_url.searchParams.delete('presentation_id');
-                data_url.searchParams.delete('presenter_id');
-                data_url.searchParams.delete('session_id');
+                let new_url_obj = new URL(page.url);
+                // new_url_obj.searchParams.delete('location_id');
+                new_url_obj.searchParams.delete('presentation_id');
+                new_url_obj.searchParams.delete('presenter_id');
+                new_url_obj.searchParams.delete('session_id');
 
                 // let url_location_id = slct_event_location_id;
-                // data_url.searchParams.set('location_id', url_location_id);
+                // new_url_obj.searchParams.set('location_id', url_location_id);
 
                 let new_url = `/events/${$events_slct.event_id}/launcher`;
 
diff --git a/src/routes/events/[event_id]/(launcher)/menu_session_list.svelte b/src/routes/events/[event_id]/(launcher)/menu_session_list.svelte
index 03833ef2..32331055 100644
--- a/src/routes/events/[event_id]/(launcher)/menu_session_list.svelte
+++ b/src/routes/events/[event_id]/(launcher)/menu_session_list.svelte
@@ -25,6 +25,7 @@
     }: Props = $props();
 
     // *** Import Svelte specific
+    import { page } from '$app/state';
     import { goto } from '$app/navigation';
     // import { liveQuery } from "dexie";
 
@@ -94,9 +95,10 @@
                 $events_sess.launcher.controller_trigger_send = true;
             }
 
-            data_url.searchParams.set('session_id', event_session_id);
+            let new_url_obj = new URL(page.url);
+            new_url_obj.searchParams.set('session_id', event_session_id);
 
-            let new_url = data_url.toString();
+            let new_url = new_url_obj.toString();
             if (log_lvl)
                 console.log(
                     `[UI Trace] Initiating SvelteKit goto... (+${(performance.now() - start).toFixed(2)}ms)`