diff --git a/packages/tools/src/packageTools.ts b/packages/tools/src/packageTools.ts
index 76c3897a9..b0c506261 100644
--- a/packages/tools/src/packageTools.ts
+++ b/packages/tools/src/packageTools.ts
@@ -36,6 +36,9 @@ export function extractShellApiFunctionName(functionName) {
 }
 
 export function findEngineDriver(connection, extensions: ExtensionsDirectory): EngineDriver {
+  if (!extensions) {
+    return null;
+  }
   if (_isString(connection)) {
     return extensions.drivers.find(x => x.engine == connection);
   }
diff --git a/packages/web/src/appobj/AppObjectListItem.svelte b/packages/web/src/appobj/AppObjectListItem.svelte
index ad8690ccf..b3524adaa 100644
--- a/packages/web/src/appobj/AppObjectListItem.svelte
+++ b/packages/web/src/appobj/AppObjectListItem.svelte
@@ -61,7 +61,13 @@
 
   {#if (isExpanded || isExpandedBySearch) && subItemsComponent}
     <div class="subitems">
-      <svelte:component this={subItemsComponent} {data} {filter} {passProps} />
+      <svelte:component
+        this={subItemsComponent}
+        {data}
+        {filter}
+        {passProps}
+        isExpandedOnlyBySearch={isExpandedBySearch && !isExpanded}
+      />
     </div>
   {/if}
 {/if}
diff --git a/packages/web/src/appobj/SubDatabaseList.svelte b/packages/web/src/appobj/SubDatabaseList.svelte
index 5575d2c91..7a8eeeb9c 100644
--- a/packages/web/src/appobj/SubDatabaseList.svelte
+++ b/packages/web/src/appobj/SubDatabaseList.svelte
@@ -5,17 +5,21 @@
   import AppObjectList from './AppObjectList.svelte';
   import * as databaseAppObject from './DatabaseAppObject.svelte';
   import { volatileConnectionMapStore } from '../utility/api';
+  import { getLocalStorage } from '../utility/storageCache';
 
   export let filter;
   export let data;
   export let passProps;
 
-  $: databases = useDatabaseList({ conid: data._id });
+  export let isExpandedOnlyBySearch;
+
+  $: databases = useDatabaseList({ conid: isExpandedOnlyBySearch ? null : data._id });
+  $: dbList = isExpandedOnlyBySearch ? getLocalStorage(`database_list_${data._id}`) || [] : $databases || [];
 </script>
 
 <AppObjectList
   list={_.sortBy(
-    ($databases || []).filter(x => filterName(filter, x.name)),
+    dbList.filter(x => filterName(filter, x.name)),
     x => x.sortOrder ?? x.name
   ).map(db => ({ ...db, connection: data }))}
   module={databaseAppObject}