diff --git a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl.svelte b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl.svelte
index 52018c73..bb0dbd87 100644
--- a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl.svelte
+++ b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl.svelte
@@ -13,7 +13,7 @@ interface Props {
 let {
     container_class_li = [],
     lq__event_presenter_obj_li,
-    log_lvl = 0,
+    log_lvl = $bindable(0),
     show_presentation_fields = false,
     show_session_fields = false
 }: Props = $props();
@@ -52,7 +52,7 @@ if (log_lvl) {
 
 <section class="ae_comp event_presenter_obj_tbl container {container_class_li}">
 
-{#if $lq__event_presenter_obj_li?.length}
+{#if $lq__event_presenter_obj_li && $lq__event_presenter_obj_li?.length}
 
 <div class="overflow-auto space-y-2">
 <h2 class="h3">
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 e33adc83..93306f38 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
@@ -50,23 +50,22 @@ let lq__event_presenter_obj_li = $derived(liveQuery(async () => {
     if (event_presenter_id_random_li.length) {
         results = await db_events.presenters
             .bulkGet(event_presenter_id_random_li);
-
-        return results;
     } else if (link_to_type && link_to_id) {
         console.log(`Trying where: ${dq__where_type_id_val}; equals: ${dq__where_eq_id_val}`);
         results = await db_events.presenters
             .where(dq__where_type_id_val)
             .equals(dq__where_eq_id_val)
-            .sortBy('name')
-
-        return results;
+            .sortBy('name');
     } else {
-        return null;
+        results = [];
     }
+
+    return results;
 }));
 </script>
 
 
+{#if $lq__event_presenter_obj_li && $lq__event_presenter_obj_li?.length}
 <!-- display_mode={display_mode} -->
 <Comp_event_presenter_obj_tbl
     container_class_li={container_class_li}
@@ -76,3 +75,8 @@ let lq__event_presenter_obj_li = $derived(liveQuery(async () => {
     log_lvl={log_lvl}
     >
 </Comp_event_presenter_obj_tbl>
+{:else}
+<section class="main_content grow px-1 md:px-2 pb-28 flex flex-col gap-1 items-center">
+    <p>No presenters available to show. WRAPPER</p>
+</section>
+{/if}
\ No newline at end of file
diff --git a/src/routes/events/ae_comp__event_session_obj_tbl.svelte b/src/routes/events/ae_comp__event_session_obj_tbl.svelte
index 301b5ac7..876f203a 100644
--- a/src/routes/events/ae_comp__event_session_obj_tbl.svelte
+++ b/src/routes/events/ae_comp__event_session_obj_tbl.svelte
@@ -10,7 +10,7 @@ interface Props {
 let {
     container_class_li = [],
     lq__event_session_obj_li,
-    log_lvl = 0,
+    log_lvl = $bindable(0),
     show_location_fields = true
 }: Props = $props();
 
@@ -38,7 +38,7 @@ if (log_lvl) {
 
 <section class="ae_comp event_session_obj_tbl container {container_class_li}">
 
-{#if $lq__event_session_obj_li?.length}
+{#if $lq__event_session_obj_li && $lq__event_session_obj_li?.length}
 
 <div class="overflow-auto space-y-2">
 <h2 class="h3">
diff --git a/src/routes/events/ae_comp__event_session_obj_tbl_wrapper.svelte b/src/routes/events/ae_comp__event_session_obj_tbl_wrapper.svelte
index 85baa5b2..ea7e358d 100644
--- a/src/routes/events/ae_comp__event_session_obj_tbl_wrapper.svelte
+++ b/src/routes/events/ae_comp__event_session_obj_tbl_wrapper.svelte
@@ -1,21 +1,32 @@
 <script lang="ts">
+interface Props {
+    // Exports
+    container_class_li?: string|Array<string>;
+    // export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'
+    event_session_id_random_li: Array<string>;
+    link_to_type: string;
+    link_to_id: string;
+    // export let lq__event_presentation_obj
+    log_lvl?: number;
+    show_location_fields?: boolean;
+}
+
+let {
+    container_class_li = [],
+    event_session_id_random_li,
+    link_to_type,
+    link_to_id,
+    log_lvl = $bindable(0),
+    show_location_fields = true
+}: Props = $props();
+
+
 // Imports
 import Comp_event_session_obj_tbl from './ae_comp__event_session_obj_tbl.svelte';
 
 import { liveQuery } from "dexie";
 import { db_events } from "$lib/ae_events/db_events";
 
-// Exports
-export let container_class_li: string|Array<string> = [];
-// export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher'
-export let event_session_id_random_li: Array<string>;
-export let link_to_type: string;
-export let link_to_id: string;
-// export let lq__event_presentation_obj
-export let log_lvl: number = 0;
-
-export let show_location_fields: boolean = true;
-
 if (log_lvl) {
     console.log(`link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`);
 }
@@ -29,7 +40,7 @@ let dq__where_type_id_val: string = `${link_to_type}_id_random`;
 let dq__where_eq_id_val: string = link_to_id;
 
 // *** Functions and Logic
-$: lq__event_session_obj_li = liveQuery(async () => {
+let lq__event_session_obj_li = $derived(liveQuery(async () => {
     if (event_session_id_random_li.length) {
         let results = await db_events.sessions
             .bulkGet(event_session_id_random_li);
@@ -46,7 +57,7 @@ $: lq__event_session_obj_li = liveQuery(async () => {
     } else {
         return null;
     }
-});
+}));
 </script>