From 917f7c8cf79e09b886ab7a0386355399245c984e Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <anto@standardnotes.com>
Date: Mon, 15 Jun 2026 14:19:13 -0300
Subject: [PATCH 01/12] feat: Adds search by note title

---
 .../Runtime/Display/Search/SearchUtilities.ts | 35 +++++++++++++------
 .../Domain/Runtime/Display/Search/Types.ts    |  1 +
 .../SearchOptions/SearchOptions.tsx           |  4 ++-
 .../ItemList/ItemListController.ts            |  2 ++
 .../Controllers/SearchOptionsController.ts    |  7 ++++
 5 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/packages/models/src/Domain/Runtime/Display/Search/SearchUtilities.ts b/packages/models/src/Domain/Runtime/Display/Search/SearchUtilities.ts
index 0f265ec8758..37d64dce798 100644
--- a/packages/models/src/Domain/Runtime/Display/Search/SearchUtilities.ts
+++ b/packages/models/src/Domain/Runtime/Display/Search/SearchUtilities.ts
@@ -38,18 +38,33 @@ export function itemMatchesQuery(
   searchQuery: SearchQuery,
   collection: ReferenceLookupCollection,
 ): boolean {
-  const shouldCheckForSomeTagMatches = searchQuery.shouldCheckForSomeTagMatches ?? true
-  const itemTags = collection.elementsReferencingElement(itemToMatch, ContentType.TYPES.Tag) as SNTag[]
-  const someTagsMatches =
-    shouldCheckForSomeTagMatches &&
-    itemTags.some((tag) => matchResultForStringQuery(tag, searchQuery.query) !== MatchResult.None)
-
-  if (itemToMatch.protected && !searchQuery.includeProtectedNoteText) {
-    const match = matchResultForStringQuery(itemToMatch, searchQuery.query)
-    return match === MatchResult.Title || match === MatchResult.TitleAndText || someTagsMatches
+  const { query, includeProtectedNoteText, shouldCheckForSomeTagMatches = true, noteTitleOnly = false } = searchQuery
+
+  if (query.length === 0) {
+    return true
+  }
+
+  const itemMatch = matchResultForStringQuery(itemToMatch, query)
+
+  if (noteTitleOnly) {
+    return itemMatch === MatchResult.Title
+  }
+
+  if (shouldCheckForSomeTagMatches) {
+    const itemTags = collection.elementsReferencingElement(itemToMatch, ContentType.TYPES.Tag) as SNTag[]
+    const tagMatches = itemTags.map((tag) => matchResultForStringQuery(tag, query))
+    const someTagsMatches = tagMatches.some((match) => match !== MatchResult.None)
+
+    if (someTagsMatches) {
+      return true
+    }
+  }
+
+  if (itemToMatch.protected && !includeProtectedNoteText) {
+    return itemMatch === MatchResult.Title || itemMatch === MatchResult.TitleAndText
   }
 
-  return matchResultForStringQuery(itemToMatch, searchQuery.query) !== MatchResult.None || someTagsMatches
+  return itemMatch !== MatchResult.None
 }
 
 function matchResultForStringQuery(item: SearchableItem, searchString: string): MatchResult {
diff --git a/packages/models/src/Domain/Runtime/Display/Search/Types.ts b/packages/models/src/Domain/Runtime/Display/Search/Types.ts
index e574abcaae3..fffab2e73ef 100644
--- a/packages/models/src/Domain/Runtime/Display/Search/Types.ts
+++ b/packages/models/src/Domain/Runtime/Display/Search/Types.ts
@@ -6,6 +6,7 @@ export type SearchQuery = {
   query: string
   includeProtectedNoteText: boolean
   shouldCheckForSomeTagMatches?: boolean
+  noteTitleOnly?: boolean
 }
 
 export interface ReferenceLookupCollection {
diff --git a/packages/web/src/javascripts/Components/SearchOptions/SearchOptions.tsx b/packages/web/src/javascripts/Components/SearchOptions/SearchOptions.tsx
index 89829a3eac0..667267be297 100644
--- a/packages/web/src/javascripts/Components/SearchOptions/SearchOptions.tsx
+++ b/packages/web/src/javascripts/Components/SearchOptions/SearchOptions.tsx
@@ -8,7 +8,7 @@ type Props = {
 }
 
 const SearchOptions = ({ searchOptions }: Props) => {
-  const { includeProtectedContents, includeArchived, includeTrashed } = searchOptions
+  const { includeProtectedContents, includeArchived, includeTrashed, noteTitleOnly } = searchOptions
 
   const toggleIncludeProtectedContents = useCallback(async () => {
     await searchOptions.toggleIncludeProtectedContents()
@@ -25,6 +25,8 @@ const SearchOptions = ({ searchOptions }: Props) => {
       <Bubble label="Archived" selected={includeArchived} onSelect={searchOptions.toggleIncludeArchived} />
 
       <Bubble label="Trashed" selected={includeTrashed} onSelect={searchOptions.toggleIncludeTrashed} />
+
+      <Bubble label="Note title only" selected={noteTitleOnly} onSelect={searchOptions.toggleNoteTitleOnly} />
     </div>
   )
 }
diff --git a/packages/web/src/javascripts/Controllers/ItemList/ItemListController.ts b/packages/web/src/javascripts/Controllers/ItemList/ItemListController.ts
index e407a8262b4..41b6f43f72e 100644
--- a/packages/web/src/javascripts/Controllers/ItemList/ItemListController.ts
+++ b/packages/web/src/javascripts/Controllers/ItemList/ItemListController.ts
@@ -227,6 +227,7 @@ export class ItemListController
           this.searchOptionsController.includeProtectedContents,
           this.searchOptionsController.includeArchived,
           this.searchOptionsController.includeTrashed,
+          this.searchOptionsController.noteTitleOnly,
         ],
         () => {
           this.reloadNotesDisplayOptions()
@@ -642,6 +643,7 @@ export class ItemListController
       searchQuery: {
         query: searchText,
         includeProtectedNoteText: this.searchOptionsController.includeProtectedContents,
+        noteTitleOnly: this.searchOptionsController.noteTitleOnly,
       },
     }
 
diff --git a/packages/web/src/javascripts/Controllers/SearchOptionsController.ts b/packages/web/src/javascripts/Controllers/SearchOptionsController.ts
index 0ae8ccf8cad..944def1a9c7 100644
--- a/packages/web/src/javascripts/Controllers/SearchOptionsController.ts
+++ b/packages/web/src/javascripts/Controllers/SearchOptionsController.ts
@@ -12,6 +12,7 @@ export class SearchOptionsController extends AbstractViewController implements I
   includeProtectedContents = false
   includeArchived = false
   includeTrashed = false
+  noteTitleOnly = false
 
   constructor(
     private protections: ProtectionsClientInterface,
@@ -23,11 +24,13 @@ export class SearchOptionsController extends AbstractViewController implements I
       includeProtectedContents: observable,
       includeTrashed: observable,
       includeArchived: observable,
+      noteTitleOnly: observable,
 
       toggleIncludeArchived: action,
       toggleIncludeTrashed: action,
       toggleIncludeProtectedContents: action,
       refreshIncludeProtectedContents: action,
+      toggleNoteTitleOnly: action,
     })
 
     eventBus.addEventHandler(this, ApplicationEvent.UnprotectedSessionBegan)
@@ -64,4 +67,8 @@ export class SearchOptionsController extends AbstractViewController implements I
       })
     }
   }
+
+  toggleNoteTitleOnly = (): void => {
+    this.noteTitleOnly = !this.noteTitleOnly
+  }
 }

From 093e76d777841b511c6b420f7026605f9f3485ac Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <anto@standardnotes.com>
Date: Mon, 15 Jun 2026 21:22:50 -0300
Subject: [PATCH 02/12] feat: Adds search enhancement feature flag

---
 .../src/Domain/InternalFeatures/InternalFeature.ts     |  1 +
 packages/web/src/javascripts/Application/DevMode.ts    |  1 +
 .../Components/ContentListView/ContentListView.tsx     |  1 +
 .../src/javascripts/Components/SearchBar/SearchBar.tsx | 10 ++++++++--
 .../Components/SearchOptions/SearchOptions.tsx         |  7 +++++--
 .../src/javascripts/Controllers/FeaturesController.ts  |  9 ++++++++-
 packages/web/src/javascripts/FeatureTrunk.ts           |  4 ++++
 7 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/packages/services/src/Domain/InternalFeatures/InternalFeature.ts b/packages/services/src/Domain/InternalFeatures/InternalFeature.ts
index 1dfa14b229d..6b86bd41679 100644
--- a/packages/services/src/Domain/InternalFeatures/InternalFeature.ts
+++ b/packages/services/src/Domain/InternalFeatures/InternalFeature.ts
@@ -1,3 +1,4 @@
 export enum InternalFeature {
   Vaults = 'vaults',
+  SearchEnhancements = 'search-enhancements',
 }
diff --git a/packages/web/src/javascripts/Application/DevMode.ts b/packages/web/src/javascripts/Application/DevMode.ts
index ead3f49c5f6..1a4ad0466b6 100644
--- a/packages/web/src/javascripts/Application/DevMode.ts
+++ b/packages/web/src/javascripts/Application/DevMode.ts
@@ -4,6 +4,7 @@ import { WebApplicationInterface } from '@standardnotes/ui-services'
 export class DevMode {
   constructor(private application: WebApplicationInterface) {
     InternalFeatureService.get().enableFeature(InternalFeature.Vaults)
+    InternalFeatureService.get().enableFeature(InternalFeature.SearchEnhancements)
   }
 
   /** Valid only when running a mock event publisher on port 3124 */
diff --git a/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx b/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx
index c66d0e2424e..e1a118b2578 100644
--- a/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx
+++ b/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx
@@ -332,6 +332,7 @@ const ContentListView = forwardRef<HTMLDivElement, Props>(
                 itemListController={itemListController}
                 searchOptionsController={searchOptionsController}
                 hideOptions={shouldUseTableView}
+                showNoteTitleOnlyOption={application.featuresController.isSearchEnhancementsEnabled()}
               />
             )}
             <NoAccountWarning
diff --git a/packages/web/src/javascripts/Components/SearchBar/SearchBar.tsx b/packages/web/src/javascripts/Components/SearchBar/SearchBar.tsx
index 5eaf25df4ec..4e98be8013c 100644
--- a/packages/web/src/javascripts/Components/SearchBar/SearchBar.tsx
+++ b/packages/web/src/javascripts/Components/SearchBar/SearchBar.tsx
@@ -14,9 +14,15 @@ type Props = {
   itemListController: ItemListController
   searchOptionsController: SearchOptionsController
   hideOptions?: boolean
+  showNoteTitleOnlyOption?: boolean
 }
 
-const SearchBar = ({ itemListController, searchOptionsController, hideOptions = false }: Props) => {
+const SearchBar = ({
+  itemListController,
+  searchOptionsController,
+  hideOptions = false,
+  showNoteTitleOnlyOption = false,
+}: Props) => {
   const searchBarRef = useRef<HTMLDivElement>(null)
   const searchInputRef = useRef<HTMLInputElement>(null)
 
@@ -68,7 +74,7 @@ const SearchBar = ({ itemListController, searchOptionsController, hideOptions =
           hideOptions ? 'hidden' : !noteFilterText && 'hidden group-focus-within:flex',
         )}
       >
-        <SearchOptions searchOptions={searchOptionsController} />
+        <SearchOptions searchOptions={searchOptionsController} showNoteTitleOnlyOption={showNoteTitleOnlyOption} />
       </div>
     </div>
   )
diff --git a/packages/web/src/javascripts/Components/SearchOptions/SearchOptions.tsx b/packages/web/src/javascripts/Components/SearchOptions/SearchOptions.tsx
index 667267be297..bf4174c05e1 100644
--- a/packages/web/src/javascripts/Components/SearchOptions/SearchOptions.tsx
+++ b/packages/web/src/javascripts/Components/SearchOptions/SearchOptions.tsx
@@ -5,9 +5,10 @@ import { SearchOptionsController } from '@/Controllers/SearchOptionsController'
 
 type Props = {
   searchOptions: SearchOptionsController
+  showNoteTitleOnlyOption?: boolean
 }
 
-const SearchOptions = ({ searchOptions }: Props) => {
+const SearchOptions = ({ searchOptions, showNoteTitleOnlyOption = false }: Props) => {
   const { includeProtectedContents, includeArchived, includeTrashed, noteTitleOnly } = searchOptions
 
   const toggleIncludeProtectedContents = useCallback(async () => {
@@ -26,7 +27,9 @@ const SearchOptions = ({ searchOptions }: Props) => {
 
       <Bubble label="Trashed" selected={includeTrashed} onSelect={searchOptions.toggleIncludeTrashed} />
 
-      <Bubble label="Note title only" selected={noteTitleOnly} onSelect={searchOptions.toggleNoteTitleOnly} />
+      {showNoteTitleOnlyOption && (
+        <Bubble label="Note title only" selected={noteTitleOnly} onSelect={searchOptions.toggleNoteTitleOnly} />
+      )}
     </div>
   )
 }
diff --git a/packages/web/src/javascripts/Controllers/FeaturesController.ts b/packages/web/src/javascripts/Controllers/FeaturesController.ts
index 1ce26bac6f5..a251d32e24a 100644
--- a/packages/web/src/javascripts/Controllers/FeaturesController.ts
+++ b/packages/web/src/javascripts/Controllers/FeaturesController.ts
@@ -13,7 +13,7 @@ import {
 import { action, makeObservable, observable, runInAction, when } from 'mobx'
 import { AbstractViewController } from './Abstract/AbstractViewController'
 import { CrossControllerEvent } from './CrossControllerEvent'
-import { featureTrunkVaultsEnabled } from '@/FeatureTrunk'
+import { featureTrunkSearchEnhancementsEnabled, featureTrunkVaultsEnabled } from '@/FeatureTrunk'
 
 export class FeaturesController extends AbstractViewController implements InternalEventHandlerInterface {
   hasFolders: boolean
@@ -152,4 +152,11 @@ export class FeaturesController extends AbstractViewController implements Intern
 
     return featureTrunkVaultsEnabled() || isEntitledToFeature
   }
+
+  isSearchEnhancementsEnabled(): boolean {
+    return (
+      featureTrunkSearchEnhancementsEnabled() ||
+      this.features.hasRole(RoleName.create(RoleName.NAMES.InternalTeamUser).getValue())
+    )
+  }
 }
diff --git a/packages/web/src/javascripts/FeatureTrunk.ts b/packages/web/src/javascripts/FeatureTrunk.ts
index b8e6128c128..92875daa7e9 100644
--- a/packages/web/src/javascripts/FeatureTrunk.ts
+++ b/packages/web/src/javascripts/FeatureTrunk.ts
@@ -11,3 +11,7 @@ export function featureTrunkEnabled(trunk: FeatureTrunkName): boolean {
 export function featureTrunkVaultsEnabled(): boolean {
   return InternalFeatureService.get().isFeatureEnabled(InternalFeature.Vaults)
 }
+
+export function featureTrunkSearchEnhancementsEnabled(): boolean {
+  return InternalFeatureService.get().isFeatureEnabled(InternalFeature.SearchEnhancements)
+}

From e800bc4710a1563e428f7122c1f3abccb538269d Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <anto@standardnotes.com>
Date: Thu, 18 Jun 2026 23:56:45 -0300
Subject: [PATCH 03/12] feat: Improve UX

---
 .../SearchOptions/SearchOptions.tsx           | 47 +++++++++++++++----
 .../Controllers/SearchOptionsController.ts    |  6 +--
 2 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/packages/web/src/javascripts/Components/SearchOptions/SearchOptions.tsx b/packages/web/src/javascripts/Components/SearchOptions/SearchOptions.tsx
index bf4174c05e1..b5c7085b4a0 100644
--- a/packages/web/src/javascripts/Components/SearchOptions/SearchOptions.tsx
+++ b/packages/web/src/javascripts/Components/SearchOptions/SearchOptions.tsx
@@ -1,35 +1,62 @@
 import { observer } from 'mobx-react-lite'
 import Bubble from '@/Components/Bubble/Bubble'
+import Checkbox from '@/Components/Checkbox/Checkbox'
 import { useCallback } from 'react'
 import { SearchOptionsController } from '@/Controllers/SearchOptionsController'
+import { classNames } from '@standardnotes/snjs'
 
-type Props = {
+type SearchBubblesProps = {
   searchOptions: SearchOptionsController
-  showNoteTitleOnlyOption?: boolean
 }
 
-const SearchOptions = ({ searchOptions, showNoteTitleOnlyOption = false }: Props) => {
-  const { includeProtectedContents, includeArchived, includeTrashed, noteTitleOnly } = searchOptions
+const SearchBubbles = observer(({ searchOptions }: SearchBubblesProps) => {
+  const { includeProtectedContents, includeArchived, includeTrashed } = searchOptions
 
   const toggleIncludeProtectedContents = useCallback(async () => {
     await searchOptions.toggleIncludeProtectedContents()
   }, [searchOptions])
 
   return (
-    <div className="mt-3 flex flex-wrap gap-2" onMouseDown={(e) => e.preventDefault()}>
+    <>
       <Bubble
         label="Protected Contents"
         selected={includeProtectedContents}
         onSelect={toggleIncludeProtectedContents}
       />
-
       <Bubble label="Archived" selected={includeArchived} onSelect={searchOptions.toggleIncludeArchived} />
-
       <Bubble label="Trashed" selected={includeTrashed} onSelect={searchOptions.toggleIncludeTrashed} />
+    </>
+  )
+})
+
+type Props = {
+  searchOptions: SearchOptionsController
+  showNoteTitleOnlyOption?: boolean
+}
+
+const SearchOptions = ({ searchOptions, showNoteTitleOnlyOption = false }: Props) => {
+  const { noteTitleOnly } = searchOptions
+
+  if (!showNoteTitleOnlyOption) {
+    return (
+      <div className="mt-3 flex flex-wrap gap-2" onMouseDown={(e) => e.preventDefault()}>
+        <SearchBubbles searchOptions={searchOptions} />
+      </div>
+    )
+  }
+
+  return (
+    <div className={classNames('mt-2 flex flex-col')} onMouseDown={(e) => e.preventDefault()}>
+      <Checkbox
+        name="search-note-title-only"
+        label="Search titles only"
+        checked={noteTitleOnly}
+        onChange={(event) => searchOptions.setNoteTitleOnly(event.target.checked)}
+      />
 
-      {showNoteTitleOnlyOption && (
-        <Bubble label="Note title only" selected={noteTitleOnly} onSelect={searchOptions.toggleNoteTitleOnly} />
-      )}
+      <div className="flex flex-wrap gap-2">
+        <SearchBubbles searchOptions={searchOptions} />
+      </div>
     </div>
   )
 }
diff --git a/packages/web/src/javascripts/Controllers/SearchOptionsController.ts b/packages/web/src/javascripts/Controllers/SearchOptionsController.ts
index 944def1a9c7..7be5f905210 100644
--- a/packages/web/src/javascripts/Controllers/SearchOptionsController.ts
+++ b/packages/web/src/javascripts/Controllers/SearchOptionsController.ts
@@ -30,7 +30,7 @@ export class SearchOptionsController extends AbstractViewController implements I
       toggleIncludeTrashed: action,
       toggleIncludeProtectedContents: action,
       refreshIncludeProtectedContents: action,
-      toggleNoteTitleOnly: action,
+      setNoteTitleOnly: action,
     })
 
     eventBus.addEventHandler(this, ApplicationEvent.UnprotectedSessionBegan)
@@ -68,7 +68,7 @@ export class SearchOptionsController extends AbstractViewController implements I
     }
   }
 
-  toggleNoteTitleOnly = (): void => {
-    this.noteTitleOnly = !this.noteTitleOnly
+  setNoteTitleOnly = (value: boolean): void => {
+    this.noteTitleOnly = value
   }
 }

From 3f14c9620be41401256254a816dfe87fe2c3e633 Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <anto@standardnotes.com>
Date: Fri, 19 Jun 2026 00:03:30 -0300
Subject: [PATCH 04/12] fix: Fixes checkboxes cursor

---
 .../src/javascripts/Components/Checkbox/Checkbox.tsx  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/web/src/javascripts/Components/Checkbox/Checkbox.tsx b/packages/web/src/javascripts/Components/Checkbox/Checkbox.tsx
index e2ace706a64..daa7cbb1d83 100644
--- a/packages/web/src/javascripts/Components/Checkbox/Checkbox.tsx
+++ b/packages/web/src/javascripts/Components/Checkbox/Checkbox.tsx
@@ -1,3 +1,4 @@
+import { classNames } from '@standardnotes/snjs'
 import { ChangeEventHandler, FunctionComponent } from 'react'
 
 type CheckboxProps = {
@@ -10,9 +11,15 @@ type CheckboxProps = {
 
 const Checkbox: FunctionComponent<CheckboxProps> = ({ name, checked, onChange, disabled, label }) => {
   return (
-    <label htmlFor={name} className="fit-content mb-2 flex items-center text-sm">
+    <label
+      htmlFor={name}
+      className={classNames(
+        'fit-content mb-2 flex items-center text-sm',
+        disabled ? 'cursor-not-allowed' : 'cursor-pointer',
+      )}
+    >
       <input
-        className="mr-2"
+        className={classNames('mr-2', disabled ? 'cursor-not-allowed' : 'cursor-pointer')}
         type="checkbox"
         name={name}
         id={name}

From 37f9fe592f3491bd8a52584ff2932edaf18a4b73 Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <anto@standardnotes.com>
Date: Fri, 19 Jun 2026 11:34:51 -0300
Subject: [PATCH 05/12] feat: Adds tag filter

---
 .../ContentListView/ContentListView.tsx       |  2 +-
 .../ItemSelectionDropdown.tsx                 | 30 +++++--
 .../Components/SearchBar/SearchBar.tsx        | 79 ++++++++++++++++---
 .../EnhancedSearchOptionsContent.tsx          | 62 +++++++++++++++
 .../SearchOptions/SearchBubbles.tsx           | 30 +++++++
 .../SearchOptions/SearchOptions.tsx           | 57 ++-----------
 .../SearchOptions/SearchOptionsSection.tsx    | 35 ++++++++
 .../SearchOptions/SearchTagFilters.tsx        | 49 ++++++++++++
 .../ItemList/ItemListController.ts            | 17 +++-
 .../Controllers/SearchOptionsController.ts    | 43 +++++++++-
 10 files changed, 334 insertions(+), 70 deletions(-)
 create mode 100644 packages/web/src/javascripts/Components/SearchOptions/EnhancedSearchOptionsContent.tsx
 create mode 100644 packages/web/src/javascripts/Components/SearchOptions/SearchBubbles.tsx
 create mode 100644 packages/web/src/javascripts/Components/SearchOptions/SearchOptionsSection.tsx
 create mode 100644 packages/web/src/javascripts/Components/SearchOptions/SearchTagFilters.tsx

diff --git a/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx b/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx
index e1a118b2578..aaea8c3afb7 100644
--- a/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx
+++ b/packages/web/src/javascripts/Components/ContentListView/ContentListView.tsx
@@ -332,7 +332,7 @@ const ContentListView = forwardRef<HTMLDivElement, Props>(
                 itemListController={itemListController}
                 searchOptionsController={searchOptionsController}
                 hideOptions={shouldUseTableView}
-                showNoteTitleOnlyOption={application.featuresController.isSearchEnhancementsEnabled()}
+                showSearchEnhancements={application.featuresController.isSearchEnhancementsEnabled()}
               />
             )}
             <NoAccountWarning
diff --git a/packages/web/src/javascripts/Components/ItemSelectionDropdown/ItemSelectionDropdown.tsx b/packages/web/src/javascripts/Components/ItemSelectionDropdown/ItemSelectionDropdown.tsx
index 1ec620c8bfe..54c79bc6957 100644
--- a/packages/web/src/javascripts/Components/ItemSelectionDropdown/ItemSelectionDropdown.tsx
+++ b/packages/web/src/javascripts/Components/ItemSelectionDropdown/ItemSelectionDropdown.tsx
@@ -9,7 +9,7 @@ import {
 } from '@ariakit/react'
 import { classNames, DecryptedItem, naturalSort } from '@standardnotes/snjs'
 import { observer } from 'mobx-react-lite'
-import { useDeferredValue, useEffect, useState } from 'react'
+import { useDeferredValue, useEffect, useRef, useState } from 'react'
 import { useApplication } from '../ApplicationProvider'
 import LinkedItemMeta from '../LinkedItems/LinkedItemMeta'
 
@@ -17,6 +17,7 @@ type Props = {
   contentTypes: string[]
   placeholder: string
   onSelection: (item: DecryptedItem) => void
+  excludeUuids?: string[]
   className?: {
     input?: string
     popover?: string
@@ -24,28 +25,47 @@ type Props = {
   comboboxProps?: ComboboxStoreProps
 }
 
-const ItemSelectionDropdown = ({ contentTypes, placeholder, onSelection, comboboxProps, className = {} }: Props) => {
+const ItemSelectionDropdown = ({
+  contentTypes,
+  placeholder,
+  onSelection,
+  excludeUuids = [],
+  comboboxProps,
+  className = {},
+}: Props) => {
   const application = useApplication()
 
   const combobox = useComboboxStore(comboboxProps)
   const value = combobox.useState('value')
   const open = combobox.useState('open')
+  const previousValueRef = useRef(value)
+
   useEffect(() => {
-    if (value.length < 1 && open) {
+    const valueWasCleared = previousValueRef.current.length > 0 && value.length < 1
+
+    if (valueWasCleared && open) {
       combobox.setOpen(false)
     }
-  }, [combobox, open, value.length])
+
+    previousValueRef.current = value
+  }, [combobox, open, value])
 
   const searchQuery = useDeferredValue(value)
   const [items, setItems] = useState<DecryptedItem[]>([])
+  const excludeUuidKey = excludeUuids.join(',')
 
   useEffect(() => {
+    const excludedUuids = new Set(excludeUuids)
     const searchableItems = naturalSort(application.items.getItems(contentTypes), 'title')
     const filteredItems = searchableItems.filter((item) => {
+      if (excludedUuids.has(item.uuid)) {
+        return false
+      }
+
       return doesItemMatchSearchQuery(item, searchQuery, application)
     })
     setItems(filteredItems)
-  }, [searchQuery, application, contentTypes])
+  }, [searchQuery, application, contentTypes, excludeUuidKey, excludeUuids])
 
   return (
     <div>
diff --git a/packages/web/src/javascripts/Components/SearchBar/SearchBar.tsx b/packages/web/src/javascripts/Components/SearchBar/SearchBar.tsx
index 4e98be8013c..3bc7da54d0d 100644
--- a/packages/web/src/javascripts/Components/SearchBar/SearchBar.tsx
+++ b/packages/web/src/javascripts/Components/SearchBar/SearchBar.tsx
@@ -1,6 +1,6 @@
 import { ItemListController } from '@/Controllers/ItemList/ItemListController'
 import { KeyboardKey } from '@standardnotes/ui-services'
-import { useCallback, KeyboardEventHandler, useRef } from 'react'
+import { useCallback, KeyboardEventHandler, useRef, useState } from 'react'
 import SearchOptions from '@/Components/SearchOptions/SearchOptions'
 import { SearchOptionsController } from '@/Controllers/SearchOptionsController'
 import Icon from '../Icon/Icon'
@@ -14,19 +14,48 @@ type Props = {
   itemListController: ItemListController
   searchOptionsController: SearchOptionsController
   hideOptions?: boolean
-  showNoteTitleOnlyOption?: boolean
+  showSearchEnhancements?: boolean
 }
 
+type SearchFilterButtonProps = {
+  activeFilterCount: number
+  isOpen: boolean
+  onClick: () => void
+}
+
+const SearchFilterButton = ({ activeFilterCount, isOpen, onClick }: SearchFilterButtonProps) => (
+  <button
+    type="button"
+    className={classNames(
+      'relative flex flex-shrink-0 cursor-pointer border-0 bg-transparent p-0',
+      isOpen ? 'text-info' : 'text-passive-1 hover:text-info',
+    )}
+    onMouseDown={(event) => event.preventDefault()}
+    onClick={onClick}
+    aria-label="Search filters"
+    aria-expanded={isOpen}
+  >
+    <Icon type="tune" className="h-4.5 w-4.5" />
+    {activeFilterCount > 0 && (
+      <span className="absolute -right-1 -top-1 flex h-3.5 min-w-3.5 items-center justify-center rounded-full bg-info px-0.5 text-[10px] font-semibold leading-none text-info-contrast">
+        {activeFilterCount}
+      </span>
+    )}
+  </button>
+)
+
 const SearchBar = ({
   itemListController,
   searchOptionsController,
   hideOptions = false,
-  showNoteTitleOnlyOption = false,
+  showSearchEnhancements = false,
 }: Props) => {
   const searchBarRef = useRef<HTMLDivElement>(null)
   const searchInputRef = useRef<HTMLInputElement>(null)
+  const [isFilterPanelOpen, setIsFilterPanelOpen] = useState(false)
 
   const { noteFilterText, setNoteFilterText, clearFilterText, onFilterEnter } = itemListController
+  const { activeSearchFilterCount } = searchOptionsController
 
   const onNoteFilterTextChange = useCallback(
     (text: string) => {
@@ -49,6 +78,39 @@ const SearchBar = ({
     searchInputRef.current?.focus()
   }, [clearFilterText])
 
+  const toggleFilterPanel = useCallback(() => {
+    setIsFilterPanelOpen((current) => !current)
+  }, [])
+
+  const searchOptionsVisibilityClass = (() => {
+    if (hideOptions) {
+      return 'hidden'
+    }
+
+    if (showSearchEnhancements) {
+      return isFilterPanelOpen ? 'flex' : 'hidden'
+    }
+
+    if (!noteFilterText) {
+      return 'hidden group-focus-within:flex'
+    }
+
+    return undefined
+  })()
+
+  const rightDecorations = showSearchEnhancements
+    ? [
+        <div key="search-actions" className="flex items-center gap-1">
+          {noteFilterText && <ClearInputButton onClick={onClearSearch} />}
+          <SearchFilterButton
+            activeFilterCount={activeSearchFilterCount}
+            isOpen={isFilterPanelOpen}
+            onClick={toggleFilterPanel}
+          />
+        </div>,
+      ]
+    : [noteFilterText && <ClearInputButton key="clear-search" onClick={onClearSearch} />].filter(Boolean)
+
   return (
     <div className="group pb-0.5 pt-3" role="search" ref={searchBarRef}>
       <DecoratedInput
@@ -64,17 +126,12 @@ const SearchBar = ({
         onChange={onNoteFilterTextChange}
         onKeyUp={onNoteFilterKeyUp}
         left={[<Icon type="search" className="mr-1 h-4.5 w-4.5 flex-shrink-0 text-passive-1" />]}
-        right={[noteFilterText && <ClearInputButton onClick={onClearSearch} />]}
+        right={rightDecorations}
         roundedFull
       />
 
-      <div
-        className={classNames(
-          'animate-fade-from-top',
-          hideOptions ? 'hidden' : !noteFilterText && 'hidden group-focus-within:flex',
-        )}
-      >
-        <SearchOptions searchOptions={searchOptionsController} showNoteTitleOnlyOption={showNoteTitleOnlyOption} />
+      <div className={classNames('animate-fade-from-top w-full', searchOptionsVisibilityClass)}>
+        <SearchOptions searchOptions={searchOptionsController} showSearchEnhancements={showSearchEnhancements} />
       </div>
     </div>
   )
diff --git a/packages/web/src/javascripts/Components/SearchOptions/EnhancedSearchOptionsContent.tsx b/packages/web/src/javascripts/Components/SearchOptions/EnhancedSearchOptionsContent.tsx
new file mode 100644
index 00000000000..3b39ae1d094
--- /dev/null
+++ b/packages/web/src/javascripts/Components/SearchOptions/EnhancedSearchOptionsContent.tsx
@@ -0,0 +1,62 @@
+import Checkbox from '@/Components/Checkbox/Checkbox'
+import { SearchOptionsController } from '@/Controllers/SearchOptionsController'
+import { classNames } from '@standardnotes/snjs'
+import { observer } from 'mobx-react-lite'
+import { useCallback } from 'react'
+import SearchBubbles from './SearchBubbles'
+import SearchOptionsSection, { ClearFilterButton } from './SearchOptionsSection'
+import SearchTagFilters from './SearchTagFilters'
+
+type Props = {
+  searchOptions: SearchOptionsController
+  className?: string
+}
+
+const EnhancedSearchOptionsContent = ({ searchOptions, className }: Props) => {
+  const { noteTitleOnly, tagFilterList, activeSearchFilterCount } = searchOptions
+
+  const clearAllTagFilters = useCallback(() => {
+    searchOptions.clearTagFilters()
+  }, [searchOptions])
+
+  const clearAllFilters = useCallback(() => {
+    searchOptions.clearAllFilters()
+  }, [searchOptions])
+
+  return (
+    <div className={classNames('flex w-full flex-col gap-2', className)}>
+      <div className="flex flex-col gap-2" onMouseDown={(event) => event.preventDefault()}>
+        <div className="flex items-start justify-between gap-2">
+          <Checkbox
+            name="search-note-title-only"
+            label="Search titles only"
+            checked={noteTitleOnly}
+            onChange={(event) => searchOptions.setNoteTitleOnly(event.target.checked)}
+          />
+          {activeSearchFilterCount > 0 && (
+            <ClearFilterButton onClick={clearAllFilters}>Clear all filters</ClearFilterButton>
+          )}
+        </div>
+
+        <SearchOptionsSection label="Include">
+          <div className="flex flex-wrap gap-2">
+            <SearchBubbles searchOptions={searchOptions} />
+          </div>
+        </SearchOptionsSection>
+      </div>
+
+      <SearchOptionsSection
+        label="Filter by tag"
+        action={
+          tagFilterList.length > 0 ? (
+            <ClearFilterButton onClick={clearAllTagFilters}>Clear tag filters</ClearFilterButton>
+          ) : undefined
+        }
+      >
+        <SearchTagFilters searchOptions={searchOptions} />
+      </SearchOptionsSection>
+    </div>
+  )
+}
+
+export default observer(EnhancedSearchOptionsContent)
diff --git a/packages/web/src/javascripts/Components/SearchOptions/SearchBubbles.tsx b/packages/web/src/javascripts/Components/SearchOptions/SearchBubbles.tsx
new file mode 100644
index 00000000000..c5ba1cfc581
--- /dev/null
+++ b/packages/web/src/javascripts/Components/SearchOptions/SearchBubbles.tsx
@@ -0,0 +1,30 @@
+import Bubble from '@/Components/Bubble/Bubble'
+import { SearchOptionsController } from '@/Controllers/SearchOptionsController'
+import { observer } from 'mobx-react-lite'
+import { useCallback } from 'react'
+
+type Props = {
+  searchOptions: SearchOptionsController
+}
+
+const SearchBubbles = ({ searchOptions }: Props) => {
+  const { includeProtectedContents, includeArchived, includeTrashed } = searchOptions
+
+  const toggleIncludeProtectedContents = useCallback(async () => {
+    await searchOptions.toggleIncludeProtectedContents()
+  }, [searchOptions])
+
+  return (
+    <>
+      <Bubble
+        label="Protected Contents"
+        selected={includeProtectedContents}
+        onSelect={toggleIncludeProtectedContents}
+      />
+      <Bubble label="Archived" selected={includeArchived} onSelect={searchOptions.toggleIncludeArchived} />
+      <Bubble label="Trashed" selected={includeTrashed} onSelect={searchOptions.toggleIncludeTrashed} />
+    </>
+  )
+}
+
+export default observer(SearchBubbles)
diff --git a/packages/web/src/javascripts/Components/SearchOptions/SearchOptions.tsx b/packages/web/src/javascripts/Components/SearchOptions/SearchOptions.tsx
index b5c7085b4a0..63e86746dec 100644
--- a/packages/web/src/javascripts/Components/SearchOptions/SearchOptions.tsx
+++ b/packages/web/src/javascripts/Components/SearchOptions/SearchOptions.tsx
@@ -1,64 +1,23 @@
-import { observer } from 'mobx-react-lite'
-import Bubble from '@/Components/Bubble/Bubble'
-import Checkbox from '@/Components/Checkbox/Checkbox'
-import { useCallback } from 'react'
 import { SearchOptionsController } from '@/Controllers/SearchOptionsController'
-import { classNames } from '@standardnotes/snjs'
-
-type SearchBubblesProps = {
-  searchOptions: SearchOptionsController
-}
-
-const SearchBubbles = observer(({ searchOptions }: SearchBubblesProps) => {
-  const { includeProtectedContents, includeArchived, includeTrashed } = searchOptions
-
-  const toggleIncludeProtectedContents = useCallback(async () => {
-    await searchOptions.toggleIncludeProtectedContents()
-  }, [searchOptions])
-
-  return (
-    <>
-      <Bubble
-        label="Protected Contents"
-        selected={includeProtectedContents}
-        onSelect={toggleIncludeProtectedContents}
-      />
-      <Bubble label="Archived" selected={includeArchived} onSelect={searchOptions.toggleIncludeArchived} />
-      <Bubble label="Trashed" selected={includeTrashed} onSelect={searchOptions.toggleIncludeTrashed} />
-    </>
-  )
-})
+import { observer } from 'mobx-react-lite'
+import EnhancedSearchOptionsContent from './EnhancedSearchOptionsContent'
+import SearchBubbles from './SearchBubbles'
 
 type Props = {
   searchOptions: SearchOptionsController
-  showNoteTitleOnlyOption?: boolean
+  showSearchEnhancements?: boolean
 }
 
-const SearchOptions = ({ searchOptions, showNoteTitleOnlyOption = false }: Props) => {
-  const { noteTitleOnly } = searchOptions
-
-  if (!showNoteTitleOnlyOption) {
+const SearchOptions = ({ searchOptions, showSearchEnhancements = false }: Props) => {
+  if (!showSearchEnhancements) {
     return (
-      <div className="mt-3 flex flex-wrap gap-2" onMouseDown={(e) => e.preventDefault()}>
+      <div className="mt-3 flex flex-wrap gap-2" onMouseDown={(event) => event.preventDefault()}>
         <SearchBubbles searchOptions={searchOptions} />
       </div>
     )
   }
 
-  return (
-    <div className={classNames('mt-2 flex flex-col')} onMouseDown={(e) => e.preventDefault()}>
-      <Checkbox
-        name="search-note-title-only"
-        label="Search titles only"
-        checked={noteTitleOnly}
-        onChange={(event) => searchOptions.setNoteTitleOnly(event.target.checked)}
-      />
-
-      <div className="flex flex-wrap gap-2">
-        <SearchBubbles searchOptions={searchOptions} />
-      </div>
-    </div>
-  )
+  return <EnhancedSearchOptionsContent searchOptions={searchOptions} className="mt-2" />
 }
 
 export default observer(SearchOptions)
diff --git a/packages/web/src/javascripts/Components/SearchOptions/SearchOptionsSection.tsx b/packages/web/src/javascripts/Components/SearchOptions/SearchOptionsSection.tsx
new file mode 100644
index 00000000000..c8edb58e3d8
--- /dev/null
+++ b/packages/web/src/javascripts/Components/SearchOptions/SearchOptionsSection.tsx
@@ -0,0 +1,35 @@
+import { ReactNode } from 'react'
+
+type ClearFilterButtonProps = {
+  onClick: () => void
+  children: ReactNode
+}
+
+export const ClearFilterButton = ({ onClick, children }: ClearFilterButtonProps) => (
+  <button
+    type="button"
+    className="mb-2 cursor-pointer border-0 bg-transparent p-0 text-xs text-info hover:underline"
+    onMouseDown={(event) => event.preventDefault()}
+    onClick={onClick}
+  >
+    {children}
+  </button>
+)
+
+type SearchOptionsSectionProps = {
+  label: string
+  children: ReactNode
+  action?: ReactNode
+}
+
+const SearchOptionsSection = ({ label, children, action }: SearchOptionsSectionProps) => (
+  <div>
+    <div className="mb-1 flex items-center justify-between gap-2">
+      <div className="text-xs text-passive-0">{label}</div>
+      {action}
+    </div>
+    {children}
+  </div>
+)
+
+export default SearchOptionsSection
diff --git a/packages/web/src/javascripts/Components/SearchOptions/SearchTagFilters.tsx b/packages/web/src/javascripts/Components/SearchOptions/SearchTagFilters.tsx
new file mode 100644
index 00000000000..e7d5712bad0
--- /dev/null
+++ b/packages/web/src/javascripts/Components/SearchOptions/SearchTagFilters.tsx
@@ -0,0 +1,49 @@
+import ItemSelectionDropdown from '@/Components/ItemSelectionDropdown/ItemSelectionDropdown'
+import LinkedItemBubble from '@/Components/LinkedItems/LinkedItemBubble'
+import { useApplication } from '@/Components/ApplicationProvider'
+import { ElementIds } from '@/Constants/ElementIDs'
+import { SearchOptionsController } from '@/Controllers/SearchOptionsController'
+import { createLinkFromItem } from '@/Utils/Items/Search/createLinkFromItem'
+import { ContentType, SNTag } from '@standardnotes/snjs'
+import { observer } from 'mobx-react-lite'
+
+type Props = {
+  searchOptions: SearchOptionsController
+}
+
+const SearchTagFilters = ({ searchOptions }: Props) => {
+  const application = useApplication()
+  const { tagFilterList } = searchOptions
+  const selected = application.navigationController.selected
+
+  const excludeUuids = tagFilterList.map((tag) => tag.uuid)
+  if (selected instanceof SNTag && !excludeUuids.includes(selected.uuid)) {
+    excludeUuids.push(selected.uuid)
+  }
+
+  return (
+    <div className="flex flex-wrap items-center gap-2">
+      {tagFilterList.map((tag) => (
+        <LinkedItemBubble
+          key={tag.uuid}
+          className="m-0"
+          link={createLinkFromItem(tag, 'linked')}
+          unlinkItem={async (item) => {
+            searchOptions.removeTagFilter(item as SNTag)
+            document.getElementById(ElementIds.SearchBar)?.focus()
+          }}
+          isBidirectional={false}
+          inlineFlex={true}
+        />
+      ))}
+      <ItemSelectionDropdown
+        onSelection={(item) => searchOptions.addTagFilter(item as SNTag)}
+        placeholder="Add tag..."
+        contentTypes={[ContentType.TYPES.Tag]}
+        excludeUuids={excludeUuids}
+      />
+    </div>
+  )
+}
+
+export default observer(SearchTagFilters)
diff --git a/packages/web/src/javascripts/Controllers/ItemList/ItemListController.ts b/packages/web/src/javascripts/Controllers/ItemList/ItemListController.ts
index 41b6f43f72e..558966eee0c 100644
--- a/packages/web/src/javascripts/Controllers/ItemList/ItemListController.ts
+++ b/packages/web/src/javascripts/Controllers/ItemList/ItemListController.ts
@@ -228,6 +228,7 @@ export class ItemListController
           this.searchOptionsController.includeArchived,
           this.searchOptionsController.includeTrashed,
           this.searchOptionsController.noteTitleOnly,
+          this.searchOptionsController.tagFilterList.map((tag) => tag.uuid).join(','),
         ],
         () => {
           this.reloadNotesDisplayOptions()
@@ -411,7 +412,7 @@ export class ItemListController
   }
 
   get isFiltering(): boolean {
-    return !!this.noteFilterText && this.noteFilterText.length > 0
+    return this.noteFilterText.length > 0 || this.searchOptionsController.tagFilterList.length > 0
   }
 
   reloadPanelTitle = () => {
@@ -619,7 +620,7 @@ export class ItemListController
     const tag = this.navigationController.selected
 
     const searchText = this.noteFilterText.toLowerCase()
-    const isSearching = searchText.length
+    const isSearching = searchText.length > 0 || this.searchOptionsController.tagFilterList.length > 0
     let includeArchived: boolean
     let includeTrashed: boolean
 
@@ -631,10 +632,20 @@ export class ItemListController
       includeTrashed = this.displayOptions.includeTrashed ?? false
     }
 
+    const tags: SNTag[] = []
+    if (tag instanceof SNTag) {
+      tags.push(tag)
+    }
+    for (const filterTag of this.searchOptionsController.tagFilterList) {
+      if (!tags.some((existingTag) => existingTag.uuid === filterTag.uuid)) {
+        tags.push(filterTag)
+      }
+    }
+
     const criteria: NotesAndFilesDisplayControllerOptions = {
       sortBy: this.displayOptions.sortBy,
       sortDirection: this.displayOptions.sortDirection,
-      tags: tag instanceof SNTag ? [tag] : [],
+      tags,
       views: tag instanceof SmartView ? [tag] : [],
       includeArchived,
       includeTrashed,
diff --git a/packages/web/src/javascripts/Controllers/SearchOptionsController.ts b/packages/web/src/javascripts/Controllers/SearchOptionsController.ts
index 7be5f905210..4d908acbb48 100644
--- a/packages/web/src/javascripts/Controllers/SearchOptionsController.ts
+++ b/packages/web/src/javascripts/Controllers/SearchOptionsController.ts
@@ -4,8 +4,9 @@ import {
   InternalEventBusInterface,
   InternalEventHandlerInterface,
   InternalEventInterface,
+  SNTag,
 } from '@standardnotes/snjs'
-import { makeObservable, observable, action, runInAction } from 'mobx'
+import { makeObservable, observable, action, runInAction, computed } from 'mobx'
 import { AbstractViewController } from './Abstract/AbstractViewController'
 
 export class SearchOptionsController extends AbstractViewController implements InternalEventHandlerInterface {
@@ -13,6 +14,7 @@ export class SearchOptionsController extends AbstractViewController implements I
   includeArchived = false
   includeTrashed = false
   noteTitleOnly = false
+  tagFilterList: SNTag[] = []
 
   constructor(
     private protections: ProtectionsClientInterface,
@@ -25,12 +27,19 @@ export class SearchOptionsController extends AbstractViewController implements I
       includeTrashed: observable,
       includeArchived: observable,
       noteTitleOnly: observable,
+      tagFilterList: observable,
 
       toggleIncludeArchived: action,
       toggleIncludeTrashed: action,
       toggleIncludeProtectedContents: action,
       refreshIncludeProtectedContents: action,
       setNoteTitleOnly: action,
+      addTagFilter: action,
+      removeTagFilter: action,
+      clearTagFilters: action,
+      clearAllFilters: action,
+
+      activeSearchFilterCount: computed,
     })
 
     eventBus.addEventHandler(this, ApplicationEvent.UnprotectedSessionBegan)
@@ -71,4 +80,36 @@ export class SearchOptionsController extends AbstractViewController implements I
   setNoteTitleOnly = (value: boolean): void => {
     this.noteTitleOnly = value
   }
+
+  addTagFilter = (tag: SNTag): void => {
+    if (!this.tagFilterList.some((existing) => existing.uuid === tag.uuid)) {
+      this.tagFilterList = [...this.tagFilterList, tag]
+    }
+  }
+
+  removeTagFilter = (tag: SNTag): void => {
+    this.tagFilterList = this.tagFilterList.filter((existing) => existing.uuid !== tag.uuid)
+  }
+
+  clearTagFilters = (): void => {
+    this.tagFilterList = []
+  }
+
+  clearAllFilters = (): void => {
+    this.noteTitleOnly = false
+    this.includeArchived = false
+    this.includeTrashed = false
+    this.includeProtectedContents = false
+    this.tagFilterList = []
+  }
+
+  get activeSearchFilterCount(): number {
+    return (
+      Number(this.noteTitleOnly) +
+      Number(this.includeProtectedContents) +
+      Number(this.includeArchived) +
+      Number(this.includeTrashed) +
+      this.tagFilterList.length
+    )
+  }
 }

From 33f7f220e216215cc17599a04bb0e6e5bca0f6df Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <anto@standardnotes.com>
Date: Fri, 19 Jun 2026 12:40:34 -0300
Subject: [PATCH 06/12] feat: Use sheet layout for mobile

---
 .../Components/SearchBar/SearchBar.tsx        | 19 ++++++++++
 .../SearchOptions/SearchFilterSheet.tsx       | 35 +++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 packages/web/src/javascripts/Components/SearchOptions/SearchFilterSheet.tsx

diff --git a/packages/web/src/javascripts/Components/SearchBar/SearchBar.tsx b/packages/web/src/javascripts/Components/SearchBar/SearchBar.tsx
index 3bc7da54d0d..afd8d22345f 100644
--- a/packages/web/src/javascripts/Components/SearchBar/SearchBar.tsx
+++ b/packages/web/src/javascripts/Components/SearchBar/SearchBar.tsx
@@ -2,7 +2,9 @@ import { ItemListController } from '@/Controllers/ItemList/ItemListController'
 import { KeyboardKey } from '@standardnotes/ui-services'
 import { useCallback, KeyboardEventHandler, useRef, useState } from 'react'
 import SearchOptions from '@/Components/SearchOptions/SearchOptions'
+import SearchFilterSheet from '@/Components/SearchOptions/SearchFilterSheet'
 import { SearchOptionsController } from '@/Controllers/SearchOptionsController'
+import { MutuallyExclusiveMediaQueryBreakpoints, useMediaQuery } from '@/Hooks/useMediaQuery'
 import Icon from '../Icon/Icon'
 import DecoratedInput from '../Input/DecoratedInput'
 import { observer } from 'mobx-react-lite'
@@ -53,6 +55,7 @@ const SearchBar = ({
   const searchBarRef = useRef<HTMLDivElement>(null)
   const searchInputRef = useRef<HTMLInputElement>(null)
   const [isFilterPanelOpen, setIsFilterPanelOpen] = useState(false)
+  const isMobileScreen = useMediaQuery(MutuallyExclusiveMediaQueryBreakpoints.sm)
 
   const { noteFilterText, setNoteFilterText, clearFilterText, onFilterEnter } = itemListController
   const { activeSearchFilterCount } = searchOptionsController
@@ -82,12 +85,20 @@ const SearchBar = ({
     setIsFilterPanelOpen((current) => !current)
   }, [])
 
+  const closeFilterPanel = useCallback(() => {
+    setIsFilterPanelOpen(false)
+  }, [])
+
   const searchOptionsVisibilityClass = (() => {
     if (hideOptions) {
       return 'hidden'
     }
 
     if (showSearchEnhancements) {
+      if (isMobileScreen) {
+        return 'hidden'
+      }
+
       return isFilterPanelOpen ? 'flex' : 'hidden'
     }
 
@@ -133,6 +144,14 @@ const SearchBar = ({
       <div className={classNames('animate-fade-from-top w-full', searchOptionsVisibilityClass)}>
         <SearchOptions searchOptions={searchOptionsController} showSearchEnhancements={showSearchEnhancements} />
       </div>
+
+      {showSearchEnhancements && isMobileScreen && (
+        <SearchFilterSheet
+          open={isFilterPanelOpen && !hideOptions}
+          onClose={closeFilterPanel}
+          searchOptions={searchOptionsController}
+        />
+      )}
     </div>
   )
 }
diff --git a/packages/web/src/javascripts/Components/SearchOptions/SearchFilterSheet.tsx b/packages/web/src/javascripts/Components/SearchOptions/SearchFilterSheet.tsx
new file mode 100644
index 00000000000..8d047491664
--- /dev/null
+++ b/packages/web/src/javascripts/Components/SearchOptions/SearchFilterSheet.tsx
@@ -0,0 +1,35 @@
+import MobilePopoverContent from '@/Components/Popover/MobilePopoverContent'
+import { SearchOptionsController } from '@/Controllers/SearchOptionsController'
+import { useAndroidBackHandler } from '@/NativeMobileWeb/useAndroidBackHandler'
+import { observer } from 'mobx-react-lite'
+import { useEffect } from 'react'
+import EnhancedSearchOptionsContent from './EnhancedSearchOptionsContent'
+
+type Props = {
+  open: boolean
+  onClose: () => void
+  searchOptions: SearchOptionsController
+}
+
+const SearchFilterSheet = ({ open, onClose, searchOptions }: Props) => {
+  const addAndroidBackHandler = useAndroidBackHandler()
+
+  useEffect(() => {
+    if (!open) {
+      return
+    }
+
+    return addAndroidBackHandler(() => {
+      onClose()
+      return true
+    })
+  }, [addAndroidBackHandler, onClose, open])
+
+  return (
+    <MobilePopoverContent open={open} requestClose={onClose} title="Search filters" id="search-filters" className="p-4">
+      <EnhancedSearchOptionsContent searchOptions={searchOptions} />
+    </MobilePopoverContent>
+  )
+}
+
+export default observer(SearchFilterSheet)

From 63f2275c4d246777bd842cfc7ec767697a0a98a1 Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <anto@standardnotes.com>
Date: Fri, 19 Jun 2026 23:26:28 -0300
Subject: [PATCH 07/12] feat: Adds tag filter condition to smart view builder

---
 .../CompoundPredicateBuilder.tsx              | 30 +++++++++++--------
 .../CompoundPredicateBuilderController.ts     | 20 ++++++++++++-
 .../SmartViewBuilder/PredicateKeypaths.ts     |  5 +++-
 .../SmartViewBuilder/PredicateValue.tsx       | 19 ++++++++++--
 4 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/packages/web/src/javascripts/Components/SmartViewBuilder/CompoundPredicateBuilder.tsx b/packages/web/src/javascripts/Components/SmartViewBuilder/CompoundPredicateBuilder.tsx
index 549e36d2c2a..d317950f462 100644
--- a/packages/web/src/javascripts/Components/SmartViewBuilder/CompoundPredicateBuilder.tsx
+++ b/packages/web/src/javascripts/Components/SmartViewBuilder/CompoundPredicateBuilder.tsx
@@ -59,19 +59,23 @@ const CompoundPredicateBuilder = ({ controller }: Props) => {
                 </option>
               ))}
             </select>
-            <select
-              className="rounded border border-border bg-default px-2 py-1.5 focus:outline focus:outline-1 focus:outline-info"
-              value={predicate.operator}
-              onChange={(event) => {
-                setPredicate(index, { operator: event.target.value as PredicateOperator })
-              }}
-            >
-              {AllNonCompoundPredicateOperators.map((operator) => (
-                <option key={operator} value={operator}>
-                  {operator}
-                </option>
-              ))}
-            </select>
+            {PredicateKeypathTypes[predicate.keypath as PredicateKeypath] === 'tag' ? (
+              <div className="shrink-0 px-2 py-1.5 text-sm">include</div>
+            ) : (
+              <select
+                className="rounded border border-border bg-default px-2 py-1.5 focus:outline focus:outline-1 focus:outline-info"
+                value={predicate.operator}
+                onChange={(event) => {
+                  setPredicate(index, { operator: event.target.value as PredicateOperator })
+                }}
+              >
+                {AllNonCompoundPredicateOperators.map((operator) => (
+                  <option key={operator} value={operator}>
+                    {operator}
+                  </option>
+                ))}
+              </select>
+            )}
             {predicate.keypath && (
               <PredicateValue
                 keypath={predicate.keypath as PredicateKeypath}
diff --git a/packages/web/src/javascripts/Components/SmartViewBuilder/CompoundPredicateBuilderController.ts b/packages/web/src/javascripts/Components/SmartViewBuilder/CompoundPredicateBuilderController.ts
index e6ad10b195d..6d666637573 100644
--- a/packages/web/src/javascripts/Components/SmartViewBuilder/CompoundPredicateBuilderController.ts
+++ b/packages/web/src/javascripts/Components/SmartViewBuilder/CompoundPredicateBuilderController.ts
@@ -11,6 +11,16 @@ const getEmptyPredicate = (): PredicateJsonForm => {
   }
 }
 
+const toTagsPredicate = (tagTitle: PredicateJsonForm['value']): PredicateJsonForm => ({
+  keypath: 'tags',
+  operator: 'includes',
+  value: {
+    keypath: 'title',
+    operator: '=',
+    value: tagTitle,
+  },
+})
+
 export class CompoundPredicateBuilderController {
   operator: PredicateCompoundOperator = 'and'
   predicates: PredicateJsonForm[] = [getEmptyPredicate()]
@@ -64,6 +74,9 @@ export class CompoundPredicateBuilderController {
         case 'date':
           this.setPredicate(index, { value: '1.days.ago' })
           break
+        case 'tag':
+          this.setPredicate(index, { value: '' })
+          break
       }
     }
 
@@ -81,7 +94,12 @@ export class CompoundPredicateBuilderController {
   toJson(): PredicateJsonForm {
     return {
       operator: this.operator,
-      value: this.predicates,
+      value: this.predicates.map((predicate) => {
+        if (predicate.keypath === 'tags') {
+          return toTagsPredicate(predicate.value)
+        }
+        return predicate
+      }),
     }
   }
 
diff --git a/packages/web/src/javascripts/Components/SmartViewBuilder/PredicateKeypaths.ts b/packages/web/src/javascripts/Components/SmartViewBuilder/PredicateKeypaths.ts
index 1c22bfb3da5..8f624d722e7 100644
--- a/packages/web/src/javascripts/Components/SmartViewBuilder/PredicateKeypaths.ts
+++ b/packages/web/src/javascripts/Components/SmartViewBuilder/PredicateKeypaths.ts
@@ -18,6 +18,7 @@ export type PredicateKeypath =
   | 'starred'
   | 'hidePreview'
   | 'spellcheck'
+  | 'tags'
 
 export const PredicateKeypathLabels: { [k in PredicateKeypath]: string } = {
   title: 'Title',
@@ -39,10 +40,11 @@ export const PredicateKeypathLabels: { [k in PredicateKeypath]: string } = {
   starred: 'Starred',
   hidePreview: 'Hide Preview',
   spellcheck: 'Spellcheck',
+  tags: 'Tags',
 } as const
 
 export const PredicateKeypathTypes: {
-  [k in PredicateKeypath]: 'string' | 'noteType' | 'editorIdentifier' | 'number' | 'boolean' | 'date'
+  [k in PredicateKeypath]: 'string' | 'noteType' | 'editorIdentifier' | 'number' | 'boolean' | 'date' | 'tag'
 } = {
   title: 'string',
   'title.length': 'number',
@@ -63,4 +65,5 @@ export const PredicateKeypathTypes: {
   starred: 'boolean',
   hidePreview: 'boolean',
   spellcheck: 'boolean',
+  tags: 'tag',
 } as const
diff --git a/packages/web/src/javascripts/Components/SmartViewBuilder/PredicateValue.tsx b/packages/web/src/javascripts/Components/SmartViewBuilder/PredicateValue.tsx
index 63f652a4af5..7a5ef176a9a 100644
--- a/packages/web/src/javascripts/Components/SmartViewBuilder/PredicateValue.tsx
+++ b/packages/web/src/javascripts/Components/SmartViewBuilder/PredicateValue.tsx
@@ -1,5 +1,5 @@
 import { getDropdownItemsForAllEditors } from '@/Utils/DropdownItemsForEditors'
-import { NoteType } from '@standardnotes/snjs'
+import { ContentType, naturalSort, NoteType, SNTag } from '@standardnotes/snjs'
 import { useApplication } from '../ApplicationProvider'
 import { PredicateKeypath, PredicateKeypathTypes } from './PredicateKeypaths'
 
@@ -14,7 +14,22 @@ const PredicateValue = ({ keypath, value, setValue }: Props) => {
   const type = PredicateKeypathTypes[keypath]
   const editorItems = getDropdownItemsForAllEditors(application)
 
-  return type === 'noteType' ? (
+  return type === 'tag' ? (
+    <select
+      className="flex-grow truncate rounded border border-border bg-default px-2 py-1.5 focus:outline focus:outline-1 focus:outline-info"
+      value={value}
+      onChange={(event) => {
+        setValue(event.target.value)
+      }}
+    >
+      <option value="">Select a tag...</option>
+      {naturalSort(application.items.getItems<SNTag>(ContentType.TYPES.Tag), 'title').map((tag) => (
+        <option key={tag.uuid} value={tag.title}>
+          {application.items.getTagLongTitle(tag) || tag.title}
+        </option>
+      ))}
+    </select>
+  ) : type === 'noteType' ? (
     <select
       className="flex-grow rounded border border-border bg-default px-2 py-1.5 focus:outline focus:outline-1 focus:outline-info"
       value={value}

From 775ec9fc8d713d68e3e601f4d4988311f9c8fd4c Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <anto@standardnotes.com>
Date: Fri, 19 Jun 2026 23:34:42 -0300
Subject: [PATCH 08/12] chore: Clean up code

---
 .../ItemSelectionDropdown/ItemSelectionDropdown.tsx |  3 +--
 .../SearchOptions/EnhancedSearchOptionsContent.tsx  | 13 ++-----------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/packages/web/src/javascripts/Components/ItemSelectionDropdown/ItemSelectionDropdown.tsx b/packages/web/src/javascripts/Components/ItemSelectionDropdown/ItemSelectionDropdown.tsx
index 54c79bc6957..2e8954edde3 100644
--- a/packages/web/src/javascripts/Components/ItemSelectionDropdown/ItemSelectionDropdown.tsx
+++ b/packages/web/src/javascripts/Components/ItemSelectionDropdown/ItemSelectionDropdown.tsx
@@ -52,7 +52,6 @@ const ItemSelectionDropdown = ({
 
   const searchQuery = useDeferredValue(value)
   const [items, setItems] = useState<DecryptedItem[]>([])
-  const excludeUuidKey = excludeUuids.join(',')
 
   useEffect(() => {
     const excludedUuids = new Set(excludeUuids)
@@ -65,7 +64,7 @@ const ItemSelectionDropdown = ({
       return doesItemMatchSearchQuery(item, searchQuery, application)
     })
     setItems(filteredItems)
-  }, [searchQuery, application, contentTypes, excludeUuidKey, excludeUuids])
+  }, [searchQuery, application, contentTypes, excludeUuids])
 
   return (
     <div>
diff --git a/packages/web/src/javascripts/Components/SearchOptions/EnhancedSearchOptionsContent.tsx b/packages/web/src/javascripts/Components/SearchOptions/EnhancedSearchOptionsContent.tsx
index 3b39ae1d094..4c695618abd 100644
--- a/packages/web/src/javascripts/Components/SearchOptions/EnhancedSearchOptionsContent.tsx
+++ b/packages/web/src/javascripts/Components/SearchOptions/EnhancedSearchOptionsContent.tsx
@@ -2,7 +2,6 @@ import Checkbox from '@/Components/Checkbox/Checkbox'
 import { SearchOptionsController } from '@/Controllers/SearchOptionsController'
 import { classNames } from '@standardnotes/snjs'
 import { observer } from 'mobx-react-lite'
-import { useCallback } from 'react'
 import SearchBubbles from './SearchBubbles'
 import SearchOptionsSection, { ClearFilterButton } from './SearchOptionsSection'
 import SearchTagFilters from './SearchTagFilters'
@@ -15,14 +14,6 @@ type Props = {
 const EnhancedSearchOptionsContent = ({ searchOptions, className }: Props) => {
   const { noteTitleOnly, tagFilterList, activeSearchFilterCount } = searchOptions
 
-  const clearAllTagFilters = useCallback(() => {
-    searchOptions.clearTagFilters()
-  }, [searchOptions])
-
-  const clearAllFilters = useCallback(() => {
-    searchOptions.clearAllFilters()
-  }, [searchOptions])
-
   return (
     <div className={classNames('flex w-full flex-col gap-2', className)}>
       <div className="flex flex-col gap-2" onMouseDown={(event) => event.preventDefault()}>
@@ -34,7 +25,7 @@ const EnhancedSearchOptionsContent = ({ searchOptions, className }: Props) => {
             onChange={(event) => searchOptions.setNoteTitleOnly(event.target.checked)}
           />
           {activeSearchFilterCount > 0 && (
-            <ClearFilterButton onClick={clearAllFilters}>Clear all filters</ClearFilterButton>
+            <ClearFilterButton onClick={searchOptions.clearAllFilters}>Clear all filters</ClearFilterButton>
           )}
         </div>
 
@@ -49,7 +40,7 @@ const EnhancedSearchOptionsContent = ({ searchOptions, className }: Props) => {
         label="Filter by tag"
         action={
           tagFilterList.length > 0 ? (
-            <ClearFilterButton onClick={clearAllTagFilters}>Clear tag filters</ClearFilterButton>
+            <ClearFilterButton onClick={searchOptions.clearTagFilters}>Clear tag filters</ClearFilterButton>
           ) : undefined
         }
       >

From 2d9056ccc0941d3e6d323d7060bbbf2d4a2a89e1 Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <anto@standardnotes.com>
Date: Thu, 25 Jun 2026 15:09:05 -0300
Subject: [PATCH 09/12] feat: Implements or logic for tag filters

---
 .../Runtime/Display/DisplayOptionsToFilters.ts    | 15 ++++++++++-----
 .../src/Domain/Runtime/Display/Search/Types.ts    |  2 ++
 packages/snjs/lib/Services/Items/ItemManager.ts   | 12 ++++++++++++
 .../Controllers/ItemList/ItemListController.ts    |  9 ++++-----
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/packages/models/src/Domain/Runtime/Display/DisplayOptionsToFilters.ts b/packages/models/src/Domain/Runtime/Display/DisplayOptionsToFilters.ts
index e8c3da9f07b..4dfb6d5c451 100644
--- a/packages/models/src/Domain/Runtime/Display/DisplayOptionsToFilters.ts
+++ b/packages/models/src/Domain/Runtime/Display/DisplayOptionsToFilters.ts
@@ -55,6 +55,16 @@ export function computeFiltersForDisplayOptions(
     }
   }
 
+  if (options.searchQuery) {
+    const query = options.searchQuery
+    filters.push((item) => itemMatchesQuery(item, query, collection))
+
+    if (query.tagFilters && query.tagFilters.length > 0) {
+      const tagFilters = query.tagFilters
+      filters.push((item) => tagFilters.some((tag) => tag.isReferencingItem(item)))
+    }
+  }
+
   if (options.includePinned === false && !viewsPredicate?.keypathIncludesString('pinned')) {
     filters.push((item) => !item.pinned)
   }
@@ -71,11 +81,6 @@ export function computeFiltersForDisplayOptions(
     filters.push((item) => !item.archived)
   }
 
-  if (options.searchQuery) {
-    const query = options.searchQuery
-    filters.push((item) => itemMatchesQuery(item, query, collection))
-  }
-
   if (
     !viewsPredicate?.keypathIncludesString('conflict_of') &&
     !options.views?.some((v) => v.uuid === SystemViewId.TrashedNotes)
diff --git a/packages/models/src/Domain/Runtime/Display/Search/Types.ts b/packages/models/src/Domain/Runtime/Display/Search/Types.ts
index fffab2e73ef..2e8bed72804 100644
--- a/packages/models/src/Domain/Runtime/Display/Search/Types.ts
+++ b/packages/models/src/Domain/Runtime/Display/Search/Types.ts
@@ -1,5 +1,6 @@
 import { ItemCollection } from './../../Collection/Item/ItemCollection'
 import { DecryptedItemInterface } from '../../../Abstract/Item'
+import { SNTag } from '../../../Syncable/Tag'
 import { SearchableItem } from './SearchableItem'
 
 export type SearchQuery = {
@@ -7,6 +8,7 @@ export type SearchQuery = {
   includeProtectedNoteText: boolean
   shouldCheckForSomeTagMatches?: boolean
   noteTitleOnly?: boolean
+  tagFilters?: SNTag[]
 }
 
 export interface ReferenceLookupCollection {
diff --git a/packages/snjs/lib/Services/Items/ItemManager.ts b/packages/snjs/lib/Services/Items/ItemManager.ts
index 9ad4204f2eb..72430c9e529 100644
--- a/packages/snjs/lib/Services/Items/ItemManager.ts
+++ b/packages/snjs/lib/Services/Items/ItemManager.ts
@@ -170,6 +170,17 @@ export class ItemManager extends Services.AbstractService implements Services.It
       })
       .filter((tag) => tag != undefined)
 
+    const mostRecentVersionOfSearchQuery = options.searchQuery
+      ? {
+          ...options.searchQuery,
+          tagFilters: options.searchQuery.tagFilters
+            ?.map((tag) => {
+              return this.collection.find(tag.uuid) as Models.SNTag
+            })
+            .filter((tag) => tag != undefined),
+        }
+      : undefined
+
     const mostRecentVersionOfViews = options.views
       ?.map((view) => {
         if (Models.isSystemView(view)) {
@@ -184,6 +195,7 @@ export class ItemManager extends Services.AbstractService implements Services.It
       ...override,
       ...{
         tags: mostRecentVersionOfTags,
+        searchQuery: mostRecentVersionOfSearchQuery,
         views: mostRecentVersionOfViews,
         hiddenContentTypes: [ContentType.TYPES.Tag],
       },
diff --git a/packages/web/src/javascripts/Controllers/ItemList/ItemListController.ts b/packages/web/src/javascripts/Controllers/ItemList/ItemListController.ts
index 558966eee0c..8247ff333b3 100644
--- a/packages/web/src/javascripts/Controllers/ItemList/ItemListController.ts
+++ b/packages/web/src/javascripts/Controllers/ItemList/ItemListController.ts
@@ -636,11 +636,6 @@ export class ItemListController
     if (tag instanceof SNTag) {
       tags.push(tag)
     }
-    for (const filterTag of this.searchOptionsController.tagFilterList) {
-      if (!tags.some((existingTag) => existingTag.uuid === filterTag.uuid)) {
-        tags.push(filterTag)
-      }
-    }
 
     const criteria: NotesAndFilesDisplayControllerOptions = {
       sortBy: this.displayOptions.sortBy,
@@ -655,6 +650,10 @@ export class ItemListController
         query: searchText,
         includeProtectedNoteText: this.searchOptionsController.includeProtectedContents,
         noteTitleOnly: this.searchOptionsController.noteTitleOnly,
+        tagFilters:
+          this.searchOptionsController.tagFilterList.length > 0
+            ? this.searchOptionsController.tagFilterList
+            : undefined,
       },
     }
 

From ab0d29e5686b9fe6c127df09a35390125f7c19b2 Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <anto@standardnotes.com>
Date: Wed, 1 Jul 2026 14:10:01 -0300
Subject: [PATCH 10/12] fix: Includes title + body matches for search title
 only

---
 .../Runtime/Display/DisplayOptions.spec.ts    | 35 +++++++++++++++++--
 .../Runtime/Display/Search/SearchUtilities.ts |  2 +-
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/packages/models/src/Domain/Runtime/Display/DisplayOptions.spec.ts b/packages/models/src/Domain/Runtime/Display/DisplayOptions.spec.ts
index 2b6d79e119e..493a7f4fc10 100644
--- a/packages/models/src/Domain/Runtime/Display/DisplayOptions.spec.ts
+++ b/packages/models/src/Domain/Runtime/Display/DisplayOptions.spec.ts
@@ -20,7 +20,7 @@ describe('item display options', () => {
     return collection
   }
 
-  it('string query title', () => {
+  it('matches notes whose title contains the search query', () => {
     const query = 'foo'
 
     const options: NotesAndFilesDisplayOptions = {
@@ -30,7 +30,7 @@ describe('item display options', () => {
     expect(notesAndFilesMatchingOptions(options, collection.all() as SNNote[], collection)).toHaveLength(2)
   })
 
-  it('string query text', async function () {
+  it('matches notes whose body contains the search query', () => {
     const query = 'foo'
     const options: NotesAndFilesDisplayOptions = {
       searchQuery: { query: query, includeProtectedNoteText: true },
@@ -42,7 +42,7 @@ describe('item display options', () => {
     expect(notesAndFilesMatchingOptions(options, collection.all() as SNNote[], collection)).toHaveLength(2)
   })
 
-  it('string query title and text', async function () {
+  it('matches notes when the search query appears in either title or body', () => {
     const query = 'foo'
     const options: NotesAndFilesDisplayOptions = {
       searchQuery: { query: query, includeProtectedNoteText: true },
@@ -50,4 +50,33 @@ describe('item display options', () => {
     const collection = collectionWithNotes(['hello', 'foobar'], ['foo', 'fobar'])
     expect(notesAndFilesMatchingOptions(options, collection.all() as SNNote[], collection)).toHaveLength(2)
   })
+
+  describe('title-only search', () => {
+    it('matches notes when the query appears only in the title', () => {
+      const query = 'foo'
+      const options: NotesAndFilesDisplayOptions = {
+        searchQuery: { query, includeProtectedNoteText: true, noteTitleOnly: true },
+      } as jest.Mocked<NotesAndFilesDisplayOptions>
+      const collection = collectionWithNotes(['foo', 'hello', 'foobar'], ['bar', 'baz', 'qux'])
+      expect(notesAndFilesMatchingOptions(options, collection.all() as SNNote[], collection)).toHaveLength(2)
+    })
+
+    it('does not match notes when the query appears only in the body', () => {
+      const query = 'foo'
+      const options: NotesAndFilesDisplayOptions = {
+        searchQuery: { query, includeProtectedNoteText: true, noteTitleOnly: true },
+      } as jest.Mocked<NotesAndFilesDisplayOptions>
+      const collection = collectionWithNotes(['hello', 'world'], ['foo', 'foobar'])
+      expect(notesAndFilesMatchingOptions(options, collection.all() as SNNote[], collection)).toHaveLength(0)
+    })
+
+    it('matches notes with a matching title even when the query also appears in the body', () => {
+      const query = 'foo'
+      const options: NotesAndFilesDisplayOptions = {
+        searchQuery: { query, includeProtectedNoteText: true, noteTitleOnly: true },
+      } as jest.Mocked<NotesAndFilesDisplayOptions>
+      const collection = collectionWithNotes(['foo', 'hello', 'foobar'], ['bar', 'foo', 'foo'])
+      expect(notesAndFilesMatchingOptions(options, collection.all() as SNNote[], collection)).toHaveLength(2)
+    })
+  })
 })
diff --git a/packages/models/src/Domain/Runtime/Display/Search/SearchUtilities.ts b/packages/models/src/Domain/Runtime/Display/Search/SearchUtilities.ts
index 37d64dce798..a23cc695adf 100644
--- a/packages/models/src/Domain/Runtime/Display/Search/SearchUtilities.ts
+++ b/packages/models/src/Domain/Runtime/Display/Search/SearchUtilities.ts
@@ -47,7 +47,7 @@ export function itemMatchesQuery(
   const itemMatch = matchResultForStringQuery(itemToMatch, query)
 
   if (noteTitleOnly) {
-    return itemMatch === MatchResult.Title
+    return itemMatch === MatchResult.Title || itemMatch === MatchResult.TitleAndText
   }
 
   if (shouldCheckForSomeTagMatches) {

From 43924b511498624e27ca095b5e38404730f44eff Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <anto@standardnotes.com>
Date: Tue, 11 Aug 2026 16:21:07 -0300
Subject: [PATCH 11/12] chore: add package_name to fastfile [skip ci]

---
 packages/mobile/fastlane/Fastfile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/mobile/fastlane/Fastfile b/packages/mobile/fastlane/Fastfile
index 35f213a7991..2565bda1c20 100755
--- a/packages/mobile/fastlane/Fastfile
+++ b/packages/mobile/fastlane/Fastfile
@@ -115,6 +115,10 @@ platform :ios do
 end
 
 platform :android do
+  def android_package_name(variant)
+    variant == 'dev' ? 'com.standardnotes.dev' : 'com.standardnotes'
+  end
+
   def build_android(variant, versionCode)
     gradle(
       task: 'bundle',
@@ -132,6 +136,7 @@ platform :android do
     sh('yarn run android:bundle')
     build_android(variant, versionCode)
     upload_to_play_store(
+      package_name: android_package_name(variant),
       track: track,
       json_key_data: (ENV['GOOGLE_PLAY_JSON_KEY_DATA']).to_s,
       skip_upload_metadata: true,

From dfc557600043b95404b33134d7a8ab548560e975 Mon Sep 17 00:00:00 2001
From: Antonella Sgarlatta <anto@standardnotes.com>
Date: Mon, 17 Aug 2026 15:41:04 -0300
Subject: [PATCH 12/12] chore: remove internal feature flag

---
 .../src/Domain/InternalFeatures/InternalFeature.ts        | 1 -
 packages/web/src/javascripts/Application/DevMode.ts       | 1 -
 .../web/src/javascripts/Controllers/FeaturesController.ts | 8 +++-----
 packages/web/src/javascripts/FeatureTrunk.ts              | 4 ----
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/packages/services/src/Domain/InternalFeatures/InternalFeature.ts b/packages/services/src/Domain/InternalFeatures/InternalFeature.ts
index 6b86bd41679..1dfa14b229d 100644
--- a/packages/services/src/Domain/InternalFeatures/InternalFeature.ts
+++ b/packages/services/src/Domain/InternalFeatures/InternalFeature.ts
@@ -1,4 +1,3 @@
 export enum InternalFeature {
   Vaults = 'vaults',
-  SearchEnhancements = 'search-enhancements',
 }
diff --git a/packages/web/src/javascripts/Application/DevMode.ts b/packages/web/src/javascripts/Application/DevMode.ts
index 1a4ad0466b6..ead3f49c5f6 100644
--- a/packages/web/src/javascripts/Application/DevMode.ts
+++ b/packages/web/src/javascripts/Application/DevMode.ts
@@ -4,7 +4,6 @@ import { WebApplicationInterface } from '@standardnotes/ui-services'
 export class DevMode {
   constructor(private application: WebApplicationInterface) {
     InternalFeatureService.get().enableFeature(InternalFeature.Vaults)
-    InternalFeatureService.get().enableFeature(InternalFeature.SearchEnhancements)
   }
 
   /** Valid only when running a mock event publisher on port 3124 */
diff --git a/packages/web/src/javascripts/Controllers/FeaturesController.ts b/packages/web/src/javascripts/Controllers/FeaturesController.ts
index fe7ace4e9f6..ba3fefd23cb 100644
--- a/packages/web/src/javascripts/Controllers/FeaturesController.ts
+++ b/packages/web/src/javascripts/Controllers/FeaturesController.ts
@@ -13,7 +13,7 @@ import {
 import { action, makeObservable, observable, runInAction, when } from 'mobx'
 import { AbstractViewController } from './Abstract/AbstractViewController'
 import { CrossControllerEvent } from './CrossControllerEvent'
-import { featureTrunkSearchEnhancementsEnabled, featureTrunkVaultsEnabled } from '@/FeatureTrunk'
+import { featureTrunkVaultsEnabled } from '@/FeatureTrunk'
 
 export class FeaturesController extends AbstractViewController implements InternalEventHandlerInterface {
   hasFolders: boolean
@@ -158,9 +158,7 @@ export class FeaturesController extends AbstractViewController implements Intern
   }
 
   isSearchEnhancementsEnabled(): boolean {
-    return (
-      featureTrunkSearchEnhancementsEnabled() ||
-      this.features.hasRole(RoleName.create(RoleName.NAMES.InternalTeamUser).getValue())
-    )
+    // todo: remove this once the feature is released
+    return true
   }
 }
diff --git a/packages/web/src/javascripts/FeatureTrunk.ts b/packages/web/src/javascripts/FeatureTrunk.ts
index 92875daa7e9..b8e6128c128 100644
--- a/packages/web/src/javascripts/FeatureTrunk.ts
+++ b/packages/web/src/javascripts/FeatureTrunk.ts
@@ -11,7 +11,3 @@ export function featureTrunkEnabled(trunk: FeatureTrunkName): boolean {
 export function featureTrunkVaultsEnabled(): boolean {
   return InternalFeatureService.get().isFeatureEnabled(InternalFeature.Vaults)
 }
-
-export function featureTrunkSearchEnhancementsEnabled(): boolean {
-  return InternalFeatureService.get().isFeatureEnabled(InternalFeature.SearchEnhancements)
-}