diff --git a/CHANGELOG.md b/CHANGELOG.md
index 552650bf7..8797cab2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ Builds:
 - ADDED: Display "No rows" message, quick add new row
 - ADDED: Choose default database from list
 - ADDED: Default database is automatically selected on connect
+- ADDED: arm64-only build for Mac
 
 ### 6.0.0
 - ADDED: Order or filter the indexes for huge tables #922
diff --git a/packages/web/src/appobj/AppObjectGroup.svelte b/packages/web/src/appobj/AppObjectGroup.svelte
index df03400aa..3cd425706 100644
--- a/packages/web/src/appobj/AppObjectGroup.svelte
+++ b/packages/web/src/appobj/AppObjectGroup.svelte
@@ -89,6 +89,7 @@
         {passProps}
         isExpandedBySearch={filter && item.isChildMatched}
         {filter}
+        isMainMatched={item.isMainMatched}
       />
     {/each}
   </div>
diff --git a/packages/web/src/appobj/AppObjectList.svelte b/packages/web/src/appobj/AppObjectList.svelte
index 2f8100498..a32358695 100644
--- a/packages/web/src/appobj/AppObjectList.svelte
+++ b/packages/web/src/appobj/AppObjectList.svelte
@@ -40,33 +40,33 @@
       const matchResult = matcher ? matcher(data) : true;
 
       let isMatched = true;
+      let isMainMatched = true;
       let isChildMatched = true;
 
       if (matchResult == false) {
         isMatched = false;
         isChildMatched = false;
+        isMainMatched = false;
       } else if (matchResult == 'child') {
-        isMatched = true;
-        isChildMatched = true;
+        isMainMatched = false;
       } else if (matchResult == 'main') {
-        isMatched = true;
         isChildMatched = false;
       } else if (matchResult == 'none') {
         isMatched = false;
         isChildMatched = false;
+        isMainMatched = false;
       } else if (matchResult == 'both') {
-        isMatched = true;
         isChildMatched = !module.disableShowChildrenWithParentMatch;
       }
 
       const group = groupFunc ? groupFunc(data) : undefined;
-      return { group, data, isMatched, isChildMatched };
+      return { group, data, isMatched, isChildMatched, isMainMatched };
     })
   );
 
   $: filtered = dataLabeled.filter(x => x.isMatched).map(x => x.data);
-
   $: childrenMatched = dataLabeled.filter(x => x.isChildMatched).map(x => x.data);
+  $: mainMatched = dataLabeled.filter(x => x.isMainMatched).map(x => x.data);
 
   // let filtered = [];
 
@@ -136,6 +136,7 @@
       {disableContextMenu}
       {filter}
       isExpandedBySearch={filter && childrenMatched.includes(data)}
+      isMainMatched={filter && mainMatched.includes(data)}
       {passProps}
       {getIsExpanded}
       {setIsExpanded}
diff --git a/packages/web/src/appobj/AppObjectListItem.svelte b/packages/web/src/appobj/AppObjectListItem.svelte
index db3044219..e500a634e 100644
--- a/packages/web/src/appobj/AppObjectListItem.svelte
+++ b/packages/web/src/appobj/AppObjectListItem.svelte
@@ -24,6 +24,7 @@
   export let passProps;
   export let getIsExpanded = null;
   export let setIsExpanded = null;
+  export let isMainMatched = false;
 
   let isExpandedCore = false;
 
@@ -71,6 +72,7 @@
         {passProps}
         {isExpandedBySearch}
         {isExpanded}
+        {isMainMatched}
       />
     </div>
   {/if}
diff --git a/packages/web/src/appobj/SubDatabaseList.svelte b/packages/web/src/appobj/SubDatabaseList.svelte
index c50809fef..e6a8b6428 100644
--- a/packages/web/src/appobj/SubDatabaseList.svelte
+++ b/packages/web/src/appobj/SubDatabaseList.svelte
@@ -13,6 +13,7 @@
 
   export let isExpandedBySearch;
   export let isExpanded;
+  export let isMainMatched;
 
   $: isExpandedOnlyBySearch = isExpandedBySearch && !isExpanded;
 
@@ -26,6 +27,6 @@
   list={_.sortBy(dbList, x => x.sortOrder ?? x.name).map(db => ({ ...db, connection: data }))}
   module={databaseAppObject}
   {passProps}
-  filter={isExpanded ? '' : filter}
+  filter={isMainMatched ? '' : filter}
   {isExpandedBySearch}
 />