diff --git a/src/lib/elements/element_manage_event_file_li_direct.svelte b/src/lib/elements/element_manage_event_file_li_direct.svelte
index ddd7eb41..3d0ff5a8 100644
--- a/src/lib/elements/element_manage_event_file_li_direct.svelte
+++ b/src/lib/elements/element_manage_event_file_li_direct.svelte
@@ -52,7 +52,7 @@ let lq__event_file_obj_li = $derived(liveQuery(async () => {
     let results = await db_events.file
         .where(dq__where_val)
         .equals(dq__where_eq_val)
-        .and(file => file.for_id_random == dq__where_for_id_eq_val)
+        .and(file => file.for_id == dq__where_for_id_eq_val)
         .reverse()
         .sortBy('created_on')
         // .toArray()
diff --git a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_li_wrapper.svelte b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_li_wrapper.svelte
index 49c18f69..71965248 100644
--- a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_li_wrapper.svelte
+++ b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_li_wrapper.svelte
@@ -34,7 +34,7 @@ if (log_lvl) {
 // let ae_tmp: key_val = {};
 // let ae_triggers: key_val = {};
 
-let dq__where_type_id_val: string = `${link_to_type}_id_random`;
+let dq__where_type_id_val: string = `${link_to_type}_id`;
 let dq__where_eq_id_val: string = link_to_id;
 
 // *** Functions and Logic
diff --git a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl_wrapper.svelte b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl_wrapper.svelte
index ef8a7a46..11a63e9b 100644
--- a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl_wrapper.svelte
+++ b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl_wrapper.svelte
@@ -47,7 +47,7 @@ if (log_lvl) {
 
 let event_presenter_id_random_li: Array<string> = $state([]);
 
-let dq__where_type_id_val: string = `${link_to_type}_id_random`;
+let dq__where_type_id_val: string = `${link_to_type}_id`;
 let dq__where_eq_id_val: string = link_to_id ?? '';
 
 
diff --git a/src/routes/events/[event_id]/session/[session_id]/session_view.svelte b/src/routes/events/[event_id]/session/[session_id]/session_view.svelte
index b78f8c4e..c80879fe 100644
--- a/src/routes/events/[event_id]/session/[session_id]/session_view.svelte
+++ b/src/routes/events/[event_id]/session/[session_id]/session_view.svelte
@@ -960,17 +960,13 @@ let clipboard_success = $state(false);
     class="w-full"
     >
 
-    {#await lq__event_presentation_obj_li}
-    Loading....
-    {:then event_presentation_obj_li}
-    {#if event_presentation_obj_li && event_presentation_obj_li?.length > 0}
+    {#if $lq__event_presentation_obj_li && $lq__event_presentation_obj_li?.length > 0}
         <Comp_event_presentation_obj_li
-            lq__event_presentation_obj_li={event_presentation_obj_li}
+            lq__event_presentation_obj_li={lq__event_presentation_obj_li}
             log_lvl={log_lvl}
             >
         </Comp_event_presentation_obj_li>
     {/if}
-    {/await}
 
 </section>
 
diff --git a/src/routes/events/ae_comp__event_presentation_obj_li.svelte b/src/routes/events/ae_comp__event_presentation_obj_li.svelte
index 8c0ebd6a..e3a144fe 100644
--- a/src/routes/events/ae_comp__event_presentation_obj_li.svelte
+++ b/src/routes/events/ae_comp__event_presentation_obj_li.svelte
@@ -68,8 +68,6 @@ import Element_manage_event_file_li_wrap from '$lib/elements/element_manage_even
             }
 
             let presentation_data = {
-                event_id_random: $events_slct.event_id,
-                event_session_id_random: $events_slct.event_session_id,
                 name: 'TEMP Presentation Name',
                 code: 'new_presentation',
                 enable: true,
@@ -110,7 +108,7 @@ import Element_manage_event_file_li_wrap from '$lib/elements/element_manage_even
     </span>
     {/if}
 
-    <!-- {#if !$lq__event_presentation_obj_li?.length}
+    <!-- {#if !lq__event_presentation_obj_li?.length}
         <span class="text-sm text-gray-500">
             <span class="fas fa-exclamation-triangle mx-1"></span>
             No presentations available to show at this time
@@ -140,9 +138,7 @@ import Element_manage_event_file_li_wrap from '$lib/elements/element_manage_even
                 }
 
                 let presenter_data = {
-                    event_id_random: $events_slct.event_id,
-                    event_session_id_random: $events_slct.event_session_id,
-                    event_presentation_id_random: event_presentation_obj?.event_presentation_id_random,
+                    event_presentation_id: event_presentation_obj?.event_presentation_id,
                     given_name: 'New',
                     family_name: 'Presenter',
                     email: 'test+newpres@oneskyit.com',
@@ -154,7 +150,7 @@ import Element_manage_event_file_li_wrap from '$lib/elements/element_manage_even
                     api_cfg: $ae_api,
                     event_id: $events_slct.event_id,
                     event_session_id: $events_slct.event_session_id,
-                    event_presentation_id: event_presentation_obj.event_presentation_id_random,
+                    event_presentation_id: event_presentation_obj.event_presentation_id,
                     data_kv: presenter_data,
                     log_lvl: 1,
                 })
@@ -184,7 +180,7 @@ import Element_manage_event_file_li_wrap from '$lib/elements/element_manage_even
             <Element_ae_crud
                 api_cfg={$ae_api}
                 object_type={'event_presentation'}
-                object_id={event_presentation_obj?.event_presentation_id_random}
+                object_id={event_presentation_obj?.event_presentation_id}
                 field_name={'name'}
                 field_type={'text'}
                 field_value={event_presentation_obj?.name}
@@ -199,13 +195,13 @@ import Element_manage_event_file_li_wrap from '$lib/elements/element_manage_even
                     console.log(`ae_crud_updated:`, e.detail);
 
                     events_func.load_ae_obj_id__event_presentation({
-                        api_cfg: $ae_api, event_presentation_id: event_presentation_obj.event_presentation_id_random, log_lvl: 1
+                        api_cfg: $ae_api, event_presentation_id: event_presentation_obj.event_presentation_id, log_lvl: 1
                     })
                     .then(function (load_results) {
                     })
                     .then(function (load_results) {
                         // $events_trigger = 'load__event_presentation_obj_id';
-                        // $events_trig_kv['event_presentation_id'] = event_presentation_obj.event_presentation_id_random;
+                        // $events_trig_kv['event_presentation_id'] = event_presentation_obj.event_presentation_id;
                     });
                 }}
                 >
@@ -219,7 +215,7 @@ import Element_manage_event_file_li_wrap from '$lib/elements/element_manage_even
             <Element_ae_crud
                 api_cfg={$ae_api}
                 object_type={'event_presentation'}
-                object_id={event_presentation_obj?.event_presentation_id_random}
+                object_id={event_presentation_obj?.event_presentation_id}
                 field_name={'code'}
                 field_type={'text'}
                 field_value={event_presentation_obj?.code}
@@ -234,13 +230,13 @@ import Element_manage_event_file_li_wrap from '$lib/elements/element_manage_even
                     console.log(`ae_crud_updated:`, e.detail);
 
                     events_func.load_ae_obj_id__event_presentation({
-                        api_cfg: $ae_api, event_presentation_id: event_presentation_obj.event_presentation_id_random, log_lvl: 1
+                        api_cfg: $ae_api, event_presentation_id: event_presentation_obj.event_presentation_id, log_lvl: 1
                     })
                     .then(function (load_results) {
                     })
                     .then(function (load_results) {
                         // $events_trigger = 'load__event_presentation_obj_id';
-                        // $events_trig_kv['event_presentation_id'] = event_presentation_obj.event_presentation_id_random;
+                        // $events_trig_kv['event_presentation_id'] = event_presentation_obj.event_presentation_id;
                     });
                 }}
                 >
@@ -354,7 +350,7 @@ import Element_manage_event_file_li_wrap from '$lib/elements/element_manage_even
         <Element_ae_crud
             api_cfg={$ae_api}
             object_type={'event_presentation'}
-            object_id={event_presentation_obj?.event_presentation_id_random}
+            object_id={event_presentation_obj?.event_presentation_id}
             field_name={'description'}
             field_type={'textarea'}
             field_value={event_presentation_obj?.description}
@@ -369,7 +365,7 @@ import Element_manage_event_file_li_wrap from '$lib/elements/element_manage_even
             on:ae_crud_updated={e => {
                 console.log(`ae_crud_updated:`, e.detail);
 
-                events_func.load_ae_obj_id__event_presentation({api_cfg: $ae_api, event_presentation_id: event_presentation_obj.event_presentation_id_random, log_lvl: 1});
+                events_func.load_ae_obj_id__event_presentation({api_cfg: $ae_api, event_presentation_id: event_presentation_obj.event_presentation_id, log_lvl: 1});
             }}
             >
             <span class="text-sm text-semibold text-success-800-400">
@@ -381,21 +377,21 @@ import Element_manage_event_file_li_wrap from '$lib/elements/element_manage_even
                 type="button"
                 onclick={() => {
                     console.log('Show/Hide Description');
-                    if ($events_sess.pres_mgmt.show_content__presentation_description == event_presentation_obj.event_presentation_id_random) {
+                    if ($events_sess.pres_mgmt.show_content__presentation_description == event_presentation_obj.event_presentation_id) {
                         $events_sess.pres_mgmt.show_content__presentation_description = null;
 
                         // Was testing with LiveQuery
                         $events_slct.event_presentation_id = null;
                     } else {
-                        $events_sess.pres_mgmt.show_content__presentation_description = event_presentation_obj.event_presentation_id_random;
+                        $events_sess.pres_mgmt.show_content__presentation_description = event_presentation_obj.event_presentation_id;
 
                         // Was testing with LiveQuery
-                        $events_slct.event_presentation_id = event_presentation_obj.event_presentation_id_random;
+                        $events_slct.event_presentation_id = event_presentation_obj.event_presentation_id;
                     }
                 }}
                 class="btn btn-sm preset-tonal-surface hover:preset-filled-surface-500 text-xs"
                 >
-                {#if $events_sess.pres_mgmt.show_content__presentation_description == event_presentation_obj.event_presentation_id_random}
+                {#if $events_sess.pres_mgmt.show_content__presentation_description == event_presentation_obj.event_presentation_id}
                     <span class="fas fa-eye-slash mx-1"></span>
                     <span>Hide Description</span>
                 {:else}
@@ -406,7 +402,7 @@ import Element_manage_event_file_li_wrap from '$lib/elements/element_manage_even
 
             <pre
                 class="whitespace-pre-wrap p-2 bg-gray-100 rounded-md"
-                class:hidden={$events_sess.pres_mgmt.show_content__presentation_description !== event_presentation_obj.event_presentation_id_random}
+                class:hidden={$events_sess.pres_mgmt.show_content__presentation_description !== event_presentation_obj.event_presentation_id}
                 >{event_presentation_obj.description}</pre>
 
             {:else}
@@ -424,12 +420,12 @@ import Element_manage_event_file_li_wrap from '$lib/elements/element_manage_even
         </div>
 
         <!-- Show presenters for this presentation -->
-        {#if event_presentation_obj?.event_presentation_id_random}
+        {#if event_presentation_obj?.event_presentation_id}
             <Comp_event_presenter_obj_li
                 link_to_type={'event_presentation'}
-                link_to_id={event_presentation_obj?.event_presentation_id_random}
+                link_to_id={event_presentation_obj?.event_presentation_id}
                 event_presenter_id_random_li={[]}
-                log_lvl={log_lvl}
+                log_lvl={2}
                 >
             </Comp_event_presenter_obj_li>
         {/if}
@@ -438,7 +434,7 @@ import Element_manage_event_file_li_wrap from '$lib/elements/element_manage_even
         <!-- Show files for this presentation -->
         <Element_manage_event_file_li_wrap
             link_to_type={'event_presentation'}
-            link_to_id={event_presentation_obj?.event_presentation_id_random}
+            link_to_id={event_presentation_obj?.event_presentation_id}
             allow_basic={$events_loc.auth__kv.session[$events_slct.event_session_id] || $events_loc.auth__kv.presenter[$events_slct.event_presenter_id]}
             allow_moderator={$events_loc.auth__kv.session[$events_slct.event_session_id]}
             container_class_li={''}