From 16211e51d188d304b220a872b9be93881e05e5b3 Mon Sep 17 00:00:00 2001
From: Tim Haasdyk <tim_haasdyk@sil.org>
Date: Fri, 10 Oct 2025 16:12:15 +0200
Subject: [PATCH 1/7] Make field filter-select match other filter-selects

---
 .../src/project/browse/SearchFilter.svelte    | 27 ++----------
 .../project/browse/filter/FieldSelect.svelte  | 41 +++++++++++++++++++
 2 files changed, 45 insertions(+), 23 deletions(-)
 create mode 100644 frontend/viewer/src/project/browse/filter/FieldSelect.svelte

diff --git a/frontend/viewer/src/project/browse/SearchFilter.svelte b/frontend/viewer/src/project/browse/SearchFilter.svelte
index c0893e4af7..8cfe727f73 100644
--- a/frontend/viewer/src/project/browse/SearchFilter.svelte
+++ b/frontend/viewer/src/project/browse/SearchFilter.svelte
@@ -13,12 +13,11 @@
   import {useCurrentView} from '$lib/views/view-service';
   import {formatNumber} from '$lib/components/ui/format';
   import ViewT from '$lib/views/ViewT.svelte';
-  import Select from '$lib/components/field-editors/select.svelte';
   import { Input } from '$lib/components/ui/input';
-  import {watch} from 'runed';
   import OpFilter, {type Op} from './filter/OpFilter.svelte';
   import WsSelect from './filter/WsSelect.svelte';
   import {useWritingSystemService} from '$lib/writing-system-service.svelte';
+  import FieldSelect, {type SelectedField} from './filter/FieldSelect.svelte';
 
   const stats = useProjectStats();
   const currentView = useCurrentView();
@@ -36,19 +35,8 @@
   let missingPartOfSpeech = $state(false);
   let missingSemanticDomains = $state(false);
 
-  let fields: Array<{id: string, label: string, ws: 'vernacular-no-audio' | 'analysis-no-audio'}> = $derived([
-    { id: 'lexemeForm', label: pt($t`Lexeme Form`, $t`Word`, $currentView), ws: 'vernacular-no-audio' },
-    { id: 'citationForm', label: pt($t`Citation Form`, $t`Display as`, $currentView), ws: 'vernacular-no-audio' },
-    { id: 'senses.gloss', label: $t`Gloss`, ws: 'analysis-no-audio' },
-  ]);
-
-  // svelte-ignore state_referenced_locally
-  let selectedField = $state(fields[0]);
+  let selectedField = $state<SelectedField | null>(null);
   let selectedWs = $state<string[]>(wsService.vernacularNoAudio.map(ws => ws.wsId));
-  watch(() => fields, fields => {
-    //updates selected field when selected view changes
-    selectedField = fields.find(f => f.id === selectedField.id) ?? fields[0];
-  });
   let fieldFilterValue = $state('');
   let filterOp = $state<Op>('contains')
 
@@ -128,16 +116,9 @@
     <div class="flex flex-col @md/list:flex-row gap-2 items-stretch">
       <div class="flex flex-row gap-2 flex-1">
         <!-- Field Picker -->
-        <Select
-          bind:value={selectedField}
-          options={fields}
-          idSelector="id"
-          labelSelector="label"
-          placeholder={$t`Field`}
-          class="flex-1"
-        />
+        <FieldSelect bind:value={selectedField} />
         <!-- Writing System Picker -->
-        <WsSelect bind:value={selectedWs} wsType={selectedField.ws} />
+        <WsSelect bind:value={selectedWs} wsType={selectedField?.ws ?? 'analysis-vernacular'} />
       </div>
       <!-- Text Box: on mobile, wraps to new line -->
       <div class="flex flex-row gap-2 flex-1">
diff --git a/frontend/viewer/src/project/browse/filter/FieldSelect.svelte b/frontend/viewer/src/project/browse/filter/FieldSelect.svelte
new file mode 100644
index 0000000000..46bac62561
--- /dev/null
+++ b/frontend/viewer/src/project/browse/filter/FieldSelect.svelte
@@ -0,0 +1,41 @@
+<script lang="ts" module>
+  export type SelectedField = {
+    id: string;
+    ws: WritingSystemSelection;
+  }
+</script>
+
+<script lang="ts">
+  import * as Select from '$lib/components/ui/select';
+  import {t} from 'svelte-i18n-lingui';
+  import {pt} from '$lib/views/view-text';
+  import {useCurrentView} from '$lib/views/view-service';
+  import type {WritingSystemSelection} from '$lib/writing-system-service.svelte';
+
+  let {value = $bindable()}: { value: SelectedField | null } = $props();
+
+  type LabeledSelectedField = SelectedField & { label: string };
+
+  const currentView = useCurrentView();
+  let fields: LabeledSelectedField[] = $derived([
+    { id: 'lexemeForm', label: pt($t`Lexeme Form`, $t`Word`, $currentView), ws: 'vernacular-no-audio' },
+    { id: 'citationForm', label: pt($t`Citation Form`, $t`Display as`, $currentView), ws: 'vernacular-no-audio' },
+    { id: 'senses.gloss', label: $t`Gloss`, ws: 'analysis-no-audio' },
+  ]);
+  const labeledValue = $derived(fields.find(f => f.id === value?.id) ?? fields[0]);
+</script>
+<Select.Root type="single" bind:value={() => (value ?? fields[0]).id, (newId) => value = fields.find(f => f.id === newId) ?? fields[0]}>
+  <Select.Trigger class="flex-1">
+    {labeledValue.label}
+  </Select.Trigger>
+  <Select.Content>
+    <Select.Group>
+      <Select.GroupHeading>{$t`Field`}</Select.GroupHeading>
+      {#each fields as field (field.id)}
+        <Select.Item value={field.id} label={field.label}>
+          {field.label}
+        </Select.Item>
+      {/each}
+    </Select.Group>
+  </Select.Content>
+</Select.Root>

From 966d6e994c57c7fe4aa011b265f30a6d6c006e40 Mon Sep 17 00:00:00 2001
From: Tim Haasdyk <tim_haasdyk@sil.org>
Date: Fri, 10 Oct 2025 17:15:05 +0200
Subject: [PATCH 2/7] Add semantic domain filter

---
 .../components/field-editors/select.svelte    | 22 ++++-
 .../lib/components/ui/switch/switch.svelte    |  4 +-
 .../src/project/browse/SearchFilter.svelte    | 85 +++++++++++--------
 .../browse/filter/MissingSelect.svelte        | 32 +++++++
 .../browse/filter/SemanticDomainSelect.svelte | 26 ++++++
 5 files changed, 126 insertions(+), 43 deletions(-)
 create mode 100644 frontend/viewer/src/project/browse/filter/MissingSelect.svelte
 create mode 100644 frontend/viewer/src/project/browse/filter/SemanticDomainSelect.svelte

diff --git a/frontend/viewer/src/lib/components/field-editors/select.svelte b/frontend/viewer/src/lib/components/field-editors/select.svelte
index 5a39aedeb6..23dc47968c 100644
--- a/frontend/viewer/src/lib/components/field-editors/select.svelte
+++ b/frontend/viewer/src/lib/components/field-editors/select.svelte
@@ -26,8 +26,9 @@
     filterPlaceholder?: string;
     emptyResultsPlaceholder?: string;
     drawerTitle?: string;
-    onchange?: (value: Value) => void;
+    onchange?: (value: Value | undefined) => void;
     class?: string;
+    nullOption?: string;
   } = $props();
 
   const {
@@ -40,7 +41,8 @@
     emptyResultsPlaceholder,
     drawerTitle,
     onchange,
-    class: className
+    class: className,
+    nullOption,
   } = $derived(constProps);
 
   function getId(value: Value): Primitive {
@@ -66,7 +68,7 @@
     open = false;
   }
 
-  function selectValue(newValue: Value) {
+  function selectValue(newValue: Value | undefined) {
     value = newValue;
     onchange?.(newValue);
     open = false;
@@ -96,7 +98,7 @@
       </span>
     {:else}
       <span class="text-muted-foreground">
-        {placeholder ?? $t`None`}
+        {placeholder ?? nullOption ?? $t`None`}
         <!-- ensures that baseline alignment works for consumers of this component -->
         &nbsp;
       </span>
@@ -123,6 +125,18 @@
     <CommandList class="max-md:h-[300px] md:max-h-[50vh]">
       <CommandEmpty>{emptyResultsPlaceholder ?? $t`No items found`}</CommandEmpty>
       <CommandGroup>
+        {#if nullOption}
+          <CommandItem
+            keywords={[nullOption]}
+            onSelect={() => selectValue(undefined)}
+            class="group max-md:h-12 text-muted-foreground"
+            data-value-index={-1}
+            aria-label={nullOption}
+          >
+            <Icon icon="i-mdi-check" class={cn('md:hidden', value === null || 'invisible')} />
+            {nullOption}
+          </CommandItem>
+        {/if}
         {#each renderedOptions as option, i (getId(option))}
           {@const label = getLabel(option)}
           {@const id = getId(option)}
diff --git a/frontend/viewer/src/lib/components/ui/switch/switch.svelte b/frontend/viewer/src/lib/components/ui/switch/switch.svelte
index 9ff4de22f3..b3482e7475 100644
--- a/frontend/viewer/src/lib/components/ui/switch/switch.svelte
+++ b/frontend/viewer/src/lib/components/ui/switch/switch.svelte
@@ -20,7 +20,7 @@
     bind:checked
     class={cn(
       'focus-visible:ring-ring focus-visible:ring-offset-background data-[state=checked]:bg-primary data-[state=unchecked]:bg-input peer inline-flex h-6 w-11 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',
-      className,
+      label || className,
     )}
     {...restProps}
   >
@@ -35,7 +35,7 @@
 {/snippet}
 
 {#if label}
-  <Label class="cursor-pointer flex items-center gap-2">
+  <Label class={cn('cursor-pointer flex items-center gap-4 max-md:w-full max-md:h-10', className)}>
     {@render control()}
     <span>{label}</span>
   </Label>
diff --git a/frontend/viewer/src/project/browse/SearchFilter.svelte b/frontend/viewer/src/project/browse/SearchFilter.svelte
index 8cfe727f73..81aef9226c 100644
--- a/frontend/viewer/src/project/browse/SearchFilter.svelte
+++ b/frontend/viewer/src/project/browse/SearchFilter.svelte
@@ -4,7 +4,6 @@
   import { Icon } from '$lib/components/ui/icon';
   import { ComposableInput } from '$lib/components/ui/input';
   import { t } from 'svelte-i18n-lingui';
-  import {Switch} from '$lib/components/ui/switch';
   import {Toggle} from '$lib/components/ui/toggle';
   import {cn} from '$lib/utils';
   import {mergeProps} from 'bits-ui';
@@ -18,6 +17,11 @@
   import WsSelect from './filter/WsSelect.svelte';
   import {useWritingSystemService} from '$lib/writing-system-service.svelte';
   import FieldSelect, {type SelectedField} from './filter/FieldSelect.svelte';
+  import MissingSelect, {type MissingOption} from './filter/MissingSelect.svelte';
+  import SemanticDomainSelect from './filter/SemanticDomainSelect.svelte';
+  import Label from '$lib/components/ui/label/label.svelte';
+  import type {ISemanticDomain} from '$lib/dotnet-types';
+  import {Switch} from '$lib/components/ui/switch';
 
   const stats = useProjectStats();
   const currentView = useCurrentView();
@@ -30,31 +34,25 @@
     search: string;
     gridifyFilter: string | undefined;
   } = $props();
-  let missingExamples = $state(false);
-  let missingSenses = $state(false);
-  let missingPartOfSpeech = $state(false);
-  let missingSemanticDomains = $state(false);
 
+  let missingField = $state<MissingOption | null>(null);
   let selectedField = $state<SelectedField | null>(null);
   let selectedWs = $state<string[]>(wsService.vernacularNoAudio.map(ws => ws.wsId));
   let fieldFilterValue = $state('');
   let filterOp = $state<Op>('contains')
+  let semanticDomain = $state<ISemanticDomain>();
+  let includeSubDomains = $state(false);
 
   $effect(() => {
     let newFilter: string[] = [];
-    if (missingExamples) {
-      newFilter.push('Senses.ExampleSentences=null')
-    }
-    if (missingSenses) {
-      newFilter.push('Senses=null')
+    switch (missingField?.id) {
+      case 'examples': newFilter.push('Senses.ExampleSentences=null'); break;
+      case 'senses': newFilter.push('Senses=null'); break;
+      case 'partOfSpeech': newFilter.push('Senses.PartOfSpeechId='); break;
+      case 'semanticDomains': newFilter.push('Senses.SemanticDomains=null'); break;
     }
-    if (missingPartOfSpeech) {
-      newFilter.push('Senses.PartOfSpeechId=')
-    }
-    if (missingSemanticDomains) {
-      newFilter.push('Senses.SemanticDomains=null')
-    }
-    if (fieldFilterValue && selectedWs?.length > 0) {
+
+    if (selectedField && fieldFilterValue && selectedWs?.length > 0) {
       let op: string;
       switch (filterOp) {
         case 'starts-with': op = '^'; break;
@@ -71,6 +69,11 @@
       //construct a filter like LexemeForm[en]=value|LexemeForm[fr]=value
       newFilter.push('(' + fieldFilter.join('|') + ')')
     }
+
+    if (semanticDomain) {
+      newFilter.push(`Senses.SemanticDomains.Code${includeSubDomains ? '^' : '='}${semanticDomain.code}`);
+    }
+
     gridifyFilter = newFilter.join(', ');
   });
 
@@ -80,7 +83,7 @@
     return v.replace(/([(),|\\]|\/i)/g, '\\$1');
   }
 
-  let filtersExpanded = $state(false);
+  let filtersExpanded = $state(true);
 </script>
 
 {#snippet placeholder()}
@@ -113,26 +116,34 @@
     </ComposableInput>
   </div>
   <Collapsible.Content class="p-2 mb-2 space-y-2">
-    <div class="flex flex-col @md/list:flex-row gap-2 items-stretch">
-      <div class="flex flex-row gap-2 flex-1">
-        <!-- Field Picker -->
-        <FieldSelect bind:value={selectedField} />
-        <!-- Writing System Picker -->
-        <WsSelect bind:value={selectedWs} wsType={selectedField?.ws ?? 'analysis-vernacular'} />
-      </div>
-      <!-- Text Box: on mobile, wraps to new line -->
-      <div class="flex flex-row gap-2 flex-1">
-        <OpFilter bind:value={filterOp}/>
-        <Input
-          bind:value={fieldFilterValue}
-          placeholder={$t`Filter for`}
-          class="flex-1"
-        />
+    <div class="flex flex-col">
+      <Label class="p-2">{$t`Specific field`}</Label>
+      <div class="flex flex-col @md/list:flex-row gap-2 items-stretch">
+        <div class="flex flex-row gap-2 flex-1">
+          <!-- Field Picker -->
+          <FieldSelect bind:value={selectedField} />
+          <!-- Writing System Picker -->
+          <WsSelect bind:value={selectedWs} wsType={selectedField?.ws ?? 'analysis-vernacular'} />
+        </div>
+        <!-- Text Box: on mobile, wraps to new line -->
+        <div class="flex flex-row gap-2 flex-1">
+          <OpFilter bind:value={filterOp}/>
+          <Input
+            bind:value={fieldFilterValue}
+            placeholder={$t`Filter for`}
+            class="flex-1"
+          />
+        </div>
       </div>
     </div>
-    <Switch bind:checked={missingExamples} label={$t`Missing Examples`} />
-    <Switch bind:checked={missingSenses} label={$t`Missing Senses`} />
-    <Switch bind:checked={missingPartOfSpeech} label={$t`Missing Part of Speech`} />
-    <Switch bind:checked={missingSemanticDomains} label={$t`Missing Semantic Domains`} />
+    <div class="flex flex-col">
+      <Label class="p-2">{$t`Semantic domain`}</Label>
+      <SemanticDomainSelect bind:value={semanticDomain} />
+      <Switch class="mt-1.5" disabled={!semanticDomain} bind:checked={includeSubDomains} label={$t`Include subdomains`} />
+    </div>
+    <div class="flex flex-col">
+      <Label class="p-2">{$t`Incomplete entries`}</Label>
+      <MissingSelect bind:value={missingField} />
+    </div>
   </Collapsible.Content>
 </Collapsible.Root>
diff --git a/frontend/viewer/src/project/browse/filter/MissingSelect.svelte b/frontend/viewer/src/project/browse/filter/MissingSelect.svelte
new file mode 100644
index 0000000000..f7f066fae1
--- /dev/null
+++ b/frontend/viewer/src/project/browse/filter/MissingSelect.svelte
@@ -0,0 +1,32 @@
+<script lang="ts" module>
+  import {gt} from 'svelte-i18n-lingui';
+
+  const missingOptions = [
+    { id: 'semanticDomains', label: gt`Semantic Domains` },
+    { id: 'partOfSpeech', label: gt`Part of Speech` },
+    { id: 'senses', label: gt`Senses` },
+    { id: 'examples', label: gt`Example Sentences` },
+  ]
+
+  export type MissingOption = typeof missingOptions[number];
+</script>
+
+<script lang="ts">
+  import * as Select from '$lib/components/ui/select';
+  import {t} from 'svelte-i18n-lingui';
+
+  let {value = $bindable()}: { value: MissingOption | null } = $props();
+
+</script>
+<Select.Root type="single" bind:value={() => value?.id ?? null!, (newId) => value = missingOptions.find(f => f.id === newId) ?? null}>
+  <Select.Trigger class="flex-1">
+    {value?.label ?? $t`Missing...`}
+  </Select.Trigger>
+  <Select.Content>
+    {#each missingOptions as option (option.id)}
+      <Select.Item value={option.id} label={option.label}>
+        {option.label}
+      </Select.Item>
+    {/each}
+  </Select.Content>
+</Select.Root>
diff --git a/frontend/viewer/src/project/browse/filter/SemanticDomainSelect.svelte b/frontend/viewer/src/project/browse/filter/SemanticDomainSelect.svelte
new file mode 100644
index 0000000000..f65dd6f09c
--- /dev/null
+++ b/frontend/viewer/src/project/browse/filter/SemanticDomainSelect.svelte
@@ -0,0 +1,26 @@
+<script lang="ts" module>
+  export type SelectedField = {
+    id: string;
+    ws: WritingSystemSelection;
+  }
+</script>
+
+<script lang="ts">
+  import {useWritingSystemService, type WritingSystemSelection} from '$lib/writing-system-service.svelte';
+  import {useSemanticDomains} from '$lib/semantic-domains';
+  import type {ISemanticDomain} from '$lib/dotnet-types';
+  import {Select} from '$lib/components/field-editors';
+  import { t } from 'svelte-i18n-lingui';
+
+  let {value = $bindable()}: { value?: ISemanticDomain } = $props();
+
+  const semanticDomains = useSemanticDomains();
+  const writingSystemService = useWritingSystemService();
+</script>
+
+<Select
+  bind:value
+  options={semanticDomains.current}
+  labelSelector={(sd) => `${sd.code} ${writingSystemService.pickBestAlternative(sd.name, 'analysis')}`}
+  nullOption={$t`Any`}
+  idSelector="id" />

From b5a9ac1e470c1d35e6dc3758546b12b5bd18dd1c Mon Sep 17 00:00:00 2001
From: Tim Haasdyk <tim_haasdyk@sil.org>
Date: Fri, 10 Oct 2025 17:16:25 +0200
Subject: [PATCH 3/7] i18n:extract

---
 frontend/viewer/src/locales/en.po | 47 +++++++++++++++++++------------
 frontend/viewer/src/locales/es.po | 47 +++++++++++++++++++------------
 frontend/viewer/src/locales/fr.po | 47 +++++++++++++++++++------------
 frontend/viewer/src/locales/id.po | 47 +++++++++++++++++++------------
 frontend/viewer/src/locales/ko.po | 47 +++++++++++++++++++------------
 frontend/viewer/src/locales/ms.po | 47 +++++++++++++++++++------------
 frontend/viewer/src/locales/sw.po | 45 ++++++++++++++++++-----------
 7 files changed, 202 insertions(+), 125 deletions(-)

diff --git a/frontend/viewer/src/locales/en.po b/frontend/viewer/src/locales/en.po
index 8ba6ad6e32..ef88658003 100644
--- a/frontend/viewer/src/locales/en.po
+++ b/frontend/viewer/src/locales/en.po
@@ -134,6 +134,10 @@ msgstr "Add Word"
 msgid "an entry"
 msgstr "an entry"
 
+#: src/project/browse/filter/SemanticDomainSelect.svelte
+msgid "Any"
+msgstr "Any"
+
 #: src/project/browse/filter/WsSelect.svelte
 msgid "Any Ws"
 msgstr "Any Ws"
@@ -201,7 +205,7 @@ msgstr "Choose theme"
 msgid "Citation form"
 msgstr "Citation form"
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 msgid "Citation Form"
 msgstr "Citation Form"
 
@@ -338,7 +342,7 @@ msgstr "Dictionary Preview"
 msgid "Discard"
 msgstr "Discard"
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 #: src/lib/entry-editor/object-editors/EntryEditorPrimitive.svelte
 msgid "Display as"
 msgstr "Display as"
@@ -463,7 +467,7 @@ msgstr "Failed to synchronize."
 msgid "Feedback & Support"
 msgstr "Feedback & Support"
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 msgid "Field"
 msgstr "Field"
 
@@ -557,7 +561,7 @@ msgstr "For any other inquiries, feel free to send us an email."
 msgid "Get support"
 msgstr "Get support"
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Gloss"
 msgstr "Gloss"
@@ -603,6 +607,14 @@ msgstr "Import"
 msgid "in {0}"
 msgstr "in {0}"
 
+#: src/project/browse/SearchFilter.svelte
+msgid "Include subdomains"
+msgstr "Include subdomains"
+
+#: src/project/browse/SearchFilter.svelte
+msgid "Incomplete entries"
+msgstr "Incomplete entries"
+
 #: src/project/tasks/DoneView.svelte
 msgid "Keep going"
 msgstr "Keep going"
@@ -628,7 +640,7 @@ msgstr "Lexbox logo"
 msgid "Lexeme form"
 msgstr "Lexeme form"
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 msgid "Lexeme Form"
 msgstr "Lexeme Form"
 
@@ -706,26 +718,17 @@ msgstr "Missing Definition {0}"
 msgid "Missing Example sentence {0}"
 msgstr "Missing Example sentence {0}"
 
-#: src/project/browse/SearchFilter.svelte
-msgid "Missing Examples"
-msgstr "Missing Examples"
-
 #: src/project/tasks/tasks-service.ts
 msgid "Missing Gloss {0}"
 msgstr "Missing Gloss {0}"
 
 #: src/project/tasks/tasks-service.ts
-#: src/project/browse/SearchFilter.svelte
 msgid "Missing Part of Speech"
 msgstr "Missing Part of Speech"
 
-#: src/project/browse/SearchFilter.svelte
-msgid "Missing Semantic Domains"
-msgstr "Missing Semantic Domains"
-
-#: src/project/browse/SearchFilter.svelte
-msgid "Missing Senses"
-msgstr "Missing Senses"
+#: src/project/browse/filter/MissingSelect.svelte
+msgid "Missing..."
+msgstr "Missing..."
 
 #: src/lib/entry-editor/ItemListItem.svelte
 msgid "Move"
@@ -975,6 +978,10 @@ msgstr "Select a new task to work on"
 msgid "Select file"
 msgstr "Select file"
 
+#: src/project/browse/SearchFilter.svelte
+msgid "Semantic domain"
+msgstr "Semantic domain"
+
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Semantic domains"
 msgstr "Semantic domains"
@@ -1034,6 +1041,10 @@ msgstr "Size:"
 msgid "Skip"
 msgstr "Skip"
 
+#: src/project/browse/SearchFilter.svelte
+msgid "Specific field"
+msgstr "Specific field"
+
 #: src/project/browse/filter/OpFilter.svelte
 msgid "Starts with"
 msgstr "Starts with"
@@ -1214,8 +1225,8 @@ msgstr "View Configuration"
 msgid "Where are my projects?"
 msgstr "Where are my projects?"
 
-#: src/project/browse/SearchFilter.svelte
 #: src/project/browse/EntryMenu.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 #: src/lib/entry-editor/EntryOrSensePicker.svelte
 #: src/lib/entry-editor/EditEntryDialog.svelte
 #: src/lib/entry-editor/object-editors/EntryEditorPrimitive.svelte
diff --git a/frontend/viewer/src/locales/es.po b/frontend/viewer/src/locales/es.po
index 903b34b441..f4b4857b63 100644
--- a/frontend/viewer/src/locales/es.po
+++ b/frontend/viewer/src/locales/es.po
@@ -139,6 +139,10 @@ msgstr ""
 msgid "an entry"
 msgstr "una entrada"
 
+#: src/project/browse/filter/SemanticDomainSelect.svelte
+msgid "Any"
+msgstr ""
+
 #: src/project/browse/filter/WsSelect.svelte
 msgid "Any Ws"
 msgstr "Cualquier W"
@@ -206,7 +210,7 @@ msgstr ""
 msgid "Citation form"
 msgstr "Formulario de cita"
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 msgid "Citation Form"
 msgstr "Formulario de citación"
 
@@ -343,7 +347,7 @@ msgstr "Vista previa del diccionario"
 msgid "Discard"
 msgstr "Descartar"
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 #: src/lib/entry-editor/object-editors/EntryEditorPrimitive.svelte
 msgid "Display as"
 msgstr "Mostrar como"
@@ -468,7 +472,7 @@ msgstr "Error de sincronización."
 msgid "Feedback & Support"
 msgstr ""
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 msgid "Field"
 msgstr "Campo"
 
@@ -562,7 +566,7 @@ msgstr "Para cualquier otra consulta, no dude en enviarnos un correo electrónic
 msgid "Get support"
 msgstr ""
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Gloss"
 msgstr "Glosa"
@@ -608,6 +612,14 @@ msgstr "Importar"
 msgid "in {0}"
 msgstr "en {0}"
 
+#: src/project/browse/SearchFilter.svelte
+msgid "Include subdomains"
+msgstr ""
+
+#: src/project/browse/SearchFilter.svelte
+msgid "Incomplete entries"
+msgstr ""
+
 #: src/project/tasks/DoneView.svelte
 msgid "Keep going"
 msgstr "Continuar"
@@ -633,7 +645,7 @@ msgstr "Logotipo de Lexbox"
 msgid "Lexeme form"
 msgstr "Forma del lexema"
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 msgid "Lexeme Form"
 msgstr "Forma del lexema"
 
@@ -711,26 +723,17 @@ msgstr "Definición {0} perdida"
 msgid "Missing Example sentence {0}"
 msgstr "Frase de ejemplo {0} perdida"
 
-#: src/project/browse/SearchFilter.svelte
-msgid "Missing Examples"
-msgstr "Ejemplos perdidos"
-
 #: src/project/tasks/tasks-service.ts
 msgid "Missing Gloss {0}"
 msgstr "Glosa {0} perdida"
 
 #: src/project/tasks/tasks-service.ts
-#: src/project/browse/SearchFilter.svelte
 msgid "Missing Part of Speech"
 msgstr "Parte de la oración perdido"
 
-#: src/project/browse/SearchFilter.svelte
-msgid "Missing Semantic Domains"
-msgstr "Dominios semánticos perdidos"
-
-#: src/project/browse/SearchFilter.svelte
-msgid "Missing Senses"
-msgstr "Acepciones perdidas"
+#: src/project/browse/filter/MissingSelect.svelte
+msgid "Missing..."
+msgstr ""
 
 #: src/lib/entry-editor/ItemListItem.svelte
 msgid "Move"
@@ -980,6 +983,10 @@ msgstr "Seleccione una nueva tarea en la que trabajar"
 msgid "Select file"
 msgstr "Seleccionar archivo"
 
+#: src/project/browse/SearchFilter.svelte
+msgid "Semantic domain"
+msgstr ""
+
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Semantic domains"
 msgstr "Dominios semánticos"
@@ -1039,6 +1046,10 @@ msgstr "Tamaño:"
 msgid "Skip"
 msgstr "Saltar"
 
+#: src/project/browse/SearchFilter.svelte
+msgid "Specific field"
+msgstr ""
+
 #: src/project/browse/filter/OpFilter.svelte
 msgid "Starts with"
 msgstr "Empieza por"
@@ -1219,8 +1230,8 @@ msgstr "Ver configuración"
 msgid "Where are my projects?"
 msgstr "¿Dónde están mis proyectos?"
 
-#: src/project/browse/SearchFilter.svelte
 #: src/project/browse/EntryMenu.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 #: src/lib/entry-editor/EntryOrSensePicker.svelte
 #: src/lib/entry-editor/EditEntryDialog.svelte
 #: src/lib/entry-editor/object-editors/EntryEditorPrimitive.svelte
diff --git a/frontend/viewer/src/locales/fr.po b/frontend/viewer/src/locales/fr.po
index d54f205a6c..34db506237 100644
--- a/frontend/viewer/src/locales/fr.po
+++ b/frontend/viewer/src/locales/fr.po
@@ -139,6 +139,10 @@ msgstr ""
 msgid "an entry"
 msgstr "une entrée"
 
+#: src/project/browse/filter/SemanticDomainSelect.svelte
+msgid "Any"
+msgstr ""
+
 #: src/project/browse/filter/WsSelect.svelte
 msgid "Any Ws"
 msgstr "Tous les W"
@@ -206,7 +210,7 @@ msgstr ""
 msgid "Citation form"
 msgstr "Formulaire de citation"
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 msgid "Citation Form"
 msgstr "Formulaire de citation"
 
@@ -343,7 +347,7 @@ msgstr "Aperçu du dictionnaire"
 msgid "Discard"
 msgstr "Rejeter"
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 #: src/lib/entry-editor/object-editors/EntryEditorPrimitive.svelte
 msgid "Display as"
 msgstr "Afficher comme"
@@ -468,7 +472,7 @@ msgstr "Échec de la synchronisation."
 msgid "Feedback & Support"
 msgstr ""
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 msgid "Field"
 msgstr "Champ d'application"
 
@@ -562,7 +566,7 @@ msgstr "Pour toute autre question, n'hésitez pas à nous envoyer un courriel."
 msgid "Get support"
 msgstr ""
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Gloss"
 msgstr "Glose"
@@ -608,6 +612,14 @@ msgstr "Importation"
 msgid "in {0}"
 msgstr "dans {0}"
 
+#: src/project/browse/SearchFilter.svelte
+msgid "Include subdomains"
+msgstr ""
+
+#: src/project/browse/SearchFilter.svelte
+msgid "Incomplete entries"
+msgstr ""
+
 #: src/project/tasks/DoneView.svelte
 msgid "Keep going"
 msgstr "Continuez"
@@ -633,7 +645,7 @@ msgstr "Logo Lexbox"
 msgid "Lexeme form"
 msgstr "Forme du lexème"
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 msgid "Lexeme Form"
 msgstr "Forme du lexème"
 
@@ -711,26 +723,17 @@ msgstr "Définition manquante {0}"
 msgid "Missing Example sentence {0}"
 msgstr "Phrase d'exemple {0} manquante"
 
-#: src/project/browse/SearchFilter.svelte
-msgid "Missing Examples"
-msgstr "Exemples manquants"
-
 #: src/project/tasks/tasks-service.ts
 msgid "Missing Gloss {0}"
 msgstr "Glose {0} manquant"
 
 #: src/project/tasks/tasks-service.ts
-#: src/project/browse/SearchFilter.svelte
 msgid "Missing Part of Speech"
 msgstr "Partie du discours manquante"
 
-#: src/project/browse/SearchFilter.svelte
-msgid "Missing Semantic Domains"
-msgstr "Domaines sémantiques manquants"
-
-#: src/project/browse/SearchFilter.svelte
-msgid "Missing Senses"
-msgstr "Sens manquants"
+#: src/project/browse/filter/MissingSelect.svelte
+msgid "Missing..."
+msgstr ""
 
 #: src/lib/entry-editor/ItemListItem.svelte
 msgid "Move"
@@ -980,6 +983,10 @@ msgstr "Sélectionnez une nouvelle tâche sur laquelle travailler"
 msgid "Select file"
 msgstr "Sélectionner un fichier"
 
+#: src/project/browse/SearchFilter.svelte
+msgid "Semantic domain"
+msgstr ""
+
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Semantic domains"
 msgstr "Domaines sémantiques"
@@ -1039,6 +1046,10 @@ msgstr "Taille :"
 msgid "Skip"
 msgstr "Ignorer"
 
+#: src/project/browse/SearchFilter.svelte
+msgid "Specific field"
+msgstr ""
+
 #: src/project/browse/filter/OpFilter.svelte
 msgid "Starts with"
 msgstr "Commence par"
@@ -1219,8 +1230,8 @@ msgstr "Voir la configuration"
 msgid "Where are my projects?"
 msgstr "Où sont mes projets ?"
 
-#: src/project/browse/SearchFilter.svelte
 #: src/project/browse/EntryMenu.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 #: src/lib/entry-editor/EntryOrSensePicker.svelte
 #: src/lib/entry-editor/EditEntryDialog.svelte
 #: src/lib/entry-editor/object-editors/EntryEditorPrimitive.svelte
diff --git a/frontend/viewer/src/locales/id.po b/frontend/viewer/src/locales/id.po
index d55c05afc3..3b61163f1f 100644
--- a/frontend/viewer/src/locales/id.po
+++ b/frontend/viewer/src/locales/id.po
@@ -139,6 +139,10 @@ msgstr ""
 msgid "an entry"
 msgstr "sebuah entri"
 
+#: src/project/browse/filter/SemanticDomainSelect.svelte
+msgid "Any"
+msgstr ""
+
 #: src/project/browse/filter/WsSelect.svelte
 msgid "Any Ws"
 msgstr "Setiap Ws"
@@ -206,7 +210,7 @@ msgstr ""
 msgid "Citation form"
 msgstr "Formulir kutipan"
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 msgid "Citation Form"
 msgstr "Formulir Kutipan"
 
@@ -343,7 +347,7 @@ msgstr "Pratinjau Kamus"
 msgid "Discard"
 msgstr "Buang"
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 #: src/lib/entry-editor/object-editors/EntryEditorPrimitive.svelte
 msgid "Display as"
 msgstr "Tampilkan sebagai"
@@ -468,7 +472,7 @@ msgstr "Gagal melakukan sinkronisasi."
 msgid "Feedback & Support"
 msgstr ""
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 msgid "Field"
 msgstr "Bidang"
 
@@ -562,7 +566,7 @@ msgstr "Untuk pertanyaan lainnya, silakan kirimkan email kepada kami."
 msgid "Get support"
 msgstr ""
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Gloss"
 msgstr "Arti Singkat"
@@ -608,6 +612,14 @@ msgstr "Impor"
 msgid "in {0}"
 msgstr "di {0}"
 
+#: src/project/browse/SearchFilter.svelte
+msgid "Include subdomains"
+msgstr ""
+
+#: src/project/browse/SearchFilter.svelte
+msgid "Incomplete entries"
+msgstr ""
+
 #: src/project/tasks/DoneView.svelte
 msgid "Keep going"
 msgstr "Teruskan."
@@ -633,7 +645,7 @@ msgstr "Logo Lexbox"
 msgid "Lexeme form"
 msgstr "Bentuk leksem"
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 msgid "Lexeme Form"
 msgstr "Bentuk Leksem"
 
@@ -711,26 +723,17 @@ msgstr "Definisi yang hilang {0}"
 msgid "Missing Example sentence {0}"
 msgstr "Hilang Contoh kalimat {0}"
 
-#: src/project/browse/SearchFilter.svelte
-msgid "Missing Examples"
-msgstr "Contoh yang Hilang"
-
 #: src/project/tasks/tasks-service.ts
 msgid "Missing Gloss {0}"
 msgstr "Arti Singkat yang hilang {0}"
 
 #: src/project/tasks/tasks-service.ts
-#: src/project/browse/SearchFilter.svelte
 msgid "Missing Part of Speech"
 msgstr "Bagian Pidato yang Hilang"
 
-#: src/project/browse/SearchFilter.svelte
-msgid "Missing Semantic Domains"
-msgstr "Domain Semantik yang Hilang"
-
-#: src/project/browse/SearchFilter.svelte
-msgid "Missing Senses"
-msgstr "Pengertian yang hilang"
+#: src/project/browse/filter/MissingSelect.svelte
+msgid "Missing..."
+msgstr ""
 
 #: src/lib/entry-editor/ItemListItem.svelte
 msgid "Move"
@@ -980,6 +983,10 @@ msgstr "Pilih tugas baru untuk dikerjakan"
 msgid "Select file"
 msgstr "Pilih file"
 
+#: src/project/browse/SearchFilter.svelte
+msgid "Semantic domain"
+msgstr ""
+
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Semantic domains"
 msgstr "Domain semantik"
@@ -1039,6 +1046,10 @@ msgstr "Ukuran:"
 msgid "Skip"
 msgstr "Lewati"
 
+#: src/project/browse/SearchFilter.svelte
+msgid "Specific field"
+msgstr ""
+
 #: src/project/browse/filter/OpFilter.svelte
 msgid "Starts with"
 msgstr "Dimulai dengan"
@@ -1219,8 +1230,8 @@ msgstr "Lihat Konfigurasi"
 msgid "Where are my projects?"
 msgstr "Di mana proyek saya?"
 
-#: src/project/browse/SearchFilter.svelte
 #: src/project/browse/EntryMenu.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 #: src/lib/entry-editor/EntryOrSensePicker.svelte
 #: src/lib/entry-editor/EditEntryDialog.svelte
 #: src/lib/entry-editor/object-editors/EntryEditorPrimitive.svelte
diff --git a/frontend/viewer/src/locales/ko.po b/frontend/viewer/src/locales/ko.po
index ba81e2d64a..2520e33814 100644
--- a/frontend/viewer/src/locales/ko.po
+++ b/frontend/viewer/src/locales/ko.po
@@ -139,6 +139,10 @@ msgstr ""
 msgid "an entry"
 msgstr "항목"
 
+#: src/project/browse/filter/SemanticDomainSelect.svelte
+msgid "Any"
+msgstr ""
+
 #: src/project/browse/filter/WsSelect.svelte
 msgid "Any Ws"
 msgstr "모든 W"
@@ -206,7 +210,7 @@ msgstr ""
 msgid "Citation form"
 msgstr "인용 양식"
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 msgid "Citation Form"
 msgstr "인용 양식"
 
@@ -343,7 +347,7 @@ msgstr "사전 미리보기"
 msgid "Discard"
 msgstr "폐기"
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 #: src/lib/entry-editor/object-editors/EntryEditorPrimitive.svelte
 msgid "Display as"
 msgstr "다음으로 표시"
@@ -468,7 +472,7 @@ msgstr "동기화하지 못했습니다."
 msgid "Feedback & Support"
 msgstr ""
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 msgid "Field"
 msgstr "필드"
 
@@ -562,7 +566,7 @@ msgstr "기타 문의 사항이 있으시면 언제든지 이메일을 보내주
 msgid "Get support"
 msgstr ""
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Gloss"
 msgstr "광택"
@@ -608,6 +612,14 @@ msgstr "가져오기"
 msgid "in {0}"
 msgstr "in {0}"
 
+#: src/project/browse/SearchFilter.svelte
+msgid "Include subdomains"
+msgstr ""
+
+#: src/project/browse/SearchFilter.svelte
+msgid "Incomplete entries"
+msgstr ""
+
 #: src/project/tasks/DoneView.svelte
 msgid "Keep going"
 msgstr "계속 진행"
@@ -633,7 +645,7 @@ msgstr "렉스박스 로고"
 msgid "Lexeme form"
 msgstr "Lexeme 양식"
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 msgid "Lexeme Form"
 msgstr "Lexeme 양식"
 
@@ -711,26 +723,17 @@ msgstr "정의 누락 {0}"
 msgid "Missing Example sentence {0}"
 msgstr "누락된 예제 문장 {0}"
 
-#: src/project/browse/SearchFilter.svelte
-msgid "Missing Examples"
-msgstr "누락된 예제"
-
 #: src/project/tasks/tasks-service.ts
 msgid "Missing Gloss {0}"
 msgstr "누락된 광택 {0}"
 
 #: src/project/tasks/tasks-service.ts
-#: src/project/browse/SearchFilter.svelte
 msgid "Missing Part of Speech"
 msgstr "누락된 품사"
 
-#: src/project/browse/SearchFilter.svelte
-msgid "Missing Semantic Domains"
-msgstr "누락된 시맨틱 도메인"
-
-#: src/project/browse/SearchFilter.svelte
-msgid "Missing Senses"
-msgstr "미싱 센스"
+#: src/project/browse/filter/MissingSelect.svelte
+msgid "Missing..."
+msgstr ""
 
 #: src/lib/entry-editor/ItemListItem.svelte
 msgid "Move"
@@ -980,6 +983,10 @@ msgstr "작업할 새 작업 선택"
 msgid "Select file"
 msgstr "파일 선택"
 
+#: src/project/browse/SearchFilter.svelte
+msgid "Semantic domain"
+msgstr ""
+
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Semantic domains"
 msgstr "시맨틱 도메인"
@@ -1039,6 +1046,10 @@ msgstr "크기:"
 msgid "Skip"
 msgstr "건너뛰기"
 
+#: src/project/browse/SearchFilter.svelte
+msgid "Specific field"
+msgstr ""
+
 #: src/project/browse/filter/OpFilter.svelte
 msgid "Starts with"
 msgstr "다음으로 시작"
@@ -1219,8 +1230,8 @@ msgstr "구성 보기"
 msgid "Where are my projects?"
 msgstr "내 프로젝트는 어디에 있나요?"
 
-#: src/project/browse/SearchFilter.svelte
 #: src/project/browse/EntryMenu.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 #: src/lib/entry-editor/EntryOrSensePicker.svelte
 #: src/lib/entry-editor/EditEntryDialog.svelte
 #: src/lib/entry-editor/object-editors/EntryEditorPrimitive.svelte
diff --git a/frontend/viewer/src/locales/ms.po b/frontend/viewer/src/locales/ms.po
index 3e86e1f962..7803307d1e 100644
--- a/frontend/viewer/src/locales/ms.po
+++ b/frontend/viewer/src/locales/ms.po
@@ -139,6 +139,10 @@ msgstr ""
 msgid "an entry"
 msgstr "satu entri"
 
+#: src/project/browse/filter/SemanticDomainSelect.svelte
+msgid "Any"
+msgstr ""
+
 #: src/project/browse/filter/WsSelect.svelte
 msgid "Any Ws"
 msgstr "Mana-mana Ws"
@@ -206,7 +210,7 @@ msgstr ""
 msgid "Citation form"
 msgstr "Bentuk petikan"
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 msgid "Citation Form"
 msgstr "Bentuk Petikan"
 
@@ -343,7 +347,7 @@ msgstr "Pratonton Kamus"
 msgid "Discard"
 msgstr "Buang"
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 #: src/lib/entry-editor/object-editors/EntryEditorPrimitive.svelte
 msgid "Display as"
 msgstr "Papar sebagai"
@@ -468,7 +472,7 @@ msgstr "Gagal menyegerak."
 msgid "Feedback & Support"
 msgstr ""
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 msgid "Field"
 msgstr "Bidang"
 
@@ -562,7 +566,7 @@ msgstr ""
 msgid "Get support"
 msgstr ""
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Gloss"
 msgstr "Glos"
@@ -608,6 +612,14 @@ msgstr "Import"
 msgid "in {0}"
 msgstr ""
 
+#: src/project/browse/SearchFilter.svelte
+msgid "Include subdomains"
+msgstr ""
+
+#: src/project/browse/SearchFilter.svelte
+msgid "Incomplete entries"
+msgstr ""
+
 #: src/project/tasks/DoneView.svelte
 msgid "Keep going"
 msgstr ""
@@ -633,7 +645,7 @@ msgstr "Logo Lexbox"
 msgid "Lexeme form"
 msgstr "Bentuk leksem"
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 msgid "Lexeme Form"
 msgstr "Bentuk Leksem"
 
@@ -711,26 +723,17 @@ msgstr ""
 msgid "Missing Example sentence {0}"
 msgstr ""
 
-#: src/project/browse/SearchFilter.svelte
-msgid "Missing Examples"
-msgstr "Contoh Tiada"
-
 #: src/project/tasks/tasks-service.ts
 msgid "Missing Gloss {0}"
 msgstr ""
 
 #: src/project/tasks/tasks-service.ts
-#: src/project/browse/SearchFilter.svelte
 msgid "Missing Part of Speech"
 msgstr "Jenis Perkataan Tiada"
 
-#: src/project/browse/SearchFilter.svelte
-msgid "Missing Semantic Domains"
-msgstr "Domain Semantik Tiada"
-
-#: src/project/browse/SearchFilter.svelte
-msgid "Missing Senses"
-msgstr "Makna Tiada"
+#: src/project/browse/filter/MissingSelect.svelte
+msgid "Missing..."
+msgstr ""
 
 #: src/lib/entry-editor/ItemListItem.svelte
 msgid "Move"
@@ -980,6 +983,10 @@ msgstr ""
 msgid "Select file"
 msgstr "Pilih fail"
 
+#: src/project/browse/SearchFilter.svelte
+msgid "Semantic domain"
+msgstr ""
+
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Semantic domains"
 msgstr "Domain semantik"
@@ -1039,6 +1046,10 @@ msgstr "Saiz:"
 msgid "Skip"
 msgstr ""
 
+#: src/project/browse/SearchFilter.svelte
+msgid "Specific field"
+msgstr ""
+
 #: src/project/browse/filter/OpFilter.svelte
 msgid "Starts with"
 msgstr "Bermula dengan"
@@ -1219,8 +1230,8 @@ msgstr "Lihat Konfigurasi"
 msgid "Where are my projects?"
 msgstr "Di manakah projek saya?"
 
-#: src/project/browse/SearchFilter.svelte
 #: src/project/browse/EntryMenu.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 #: src/lib/entry-editor/EntryOrSensePicker.svelte
 #: src/lib/entry-editor/EditEntryDialog.svelte
 #: src/lib/entry-editor/object-editors/EntryEditorPrimitive.svelte
diff --git a/frontend/viewer/src/locales/sw.po b/frontend/viewer/src/locales/sw.po
index 7e2c44a0d5..dbefdbb839 100644
--- a/frontend/viewer/src/locales/sw.po
+++ b/frontend/viewer/src/locales/sw.po
@@ -139,6 +139,10 @@ msgstr ""
 msgid "an entry"
 msgstr ""
 
+#: src/project/browse/filter/SemanticDomainSelect.svelte
+msgid "Any"
+msgstr ""
+
 #: src/project/browse/filter/WsSelect.svelte
 msgid "Any Ws"
 msgstr ""
@@ -206,7 +210,7 @@ msgstr ""
 msgid "Citation form"
 msgstr ""
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 msgid "Citation Form"
 msgstr "Fomu ya Manukuu"
 
@@ -343,7 +347,7 @@ msgstr ""
 msgid "Discard"
 msgstr "Kataa mabadiliko"
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 #: src/lib/entry-editor/object-editors/EntryEditorPrimitive.svelte
 msgid "Display as"
 msgstr ""
@@ -468,7 +472,7 @@ msgstr ""
 msgid "Feedback & Support"
 msgstr ""
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 msgid "Field"
 msgstr ""
 
@@ -562,7 +566,7 @@ msgstr ""
 msgid "Get support"
 msgstr ""
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Gloss"
 msgstr "Glosi"
@@ -608,6 +612,14 @@ msgstr "Agiza"
 msgid "in {0}"
 msgstr ""
 
+#: src/project/browse/SearchFilter.svelte
+msgid "Include subdomains"
+msgstr ""
+
+#: src/project/browse/SearchFilter.svelte
+msgid "Incomplete entries"
+msgstr ""
+
 #: src/project/tasks/DoneView.svelte
 msgid "Keep going"
 msgstr ""
@@ -633,7 +645,7 @@ msgstr ""
 msgid "Lexeme form"
 msgstr ""
 
-#: src/project/browse/SearchFilter.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 msgid "Lexeme Form"
 msgstr "Fomu ya Lexeme"
 
@@ -711,25 +723,16 @@ msgstr ""
 msgid "Missing Example sentence {0}"
 msgstr ""
 
-#: src/project/browse/SearchFilter.svelte
-msgid "Missing Examples"
-msgstr ""
-
 #: src/project/tasks/tasks-service.ts
 msgid "Missing Gloss {0}"
 msgstr ""
 
 #: src/project/tasks/tasks-service.ts
-#: src/project/browse/SearchFilter.svelte
 msgid "Missing Part of Speech"
 msgstr ""
 
-#: src/project/browse/SearchFilter.svelte
-msgid "Missing Semantic Domains"
-msgstr ""
-
-#: src/project/browse/SearchFilter.svelte
-msgid "Missing Senses"
+#: src/project/browse/filter/MissingSelect.svelte
+msgid "Missing..."
 msgstr ""
 
 #: src/lib/entry-editor/ItemListItem.svelte
@@ -980,6 +983,10 @@ msgstr ""
 msgid "Select file"
 msgstr "Chagua Folda"
 
+#: src/project/browse/SearchFilter.svelte
+msgid "Semantic domain"
+msgstr ""
+
 #: src/lib/entry-editor/object-editors/SenseEditorPrimitive.svelte
 msgid "Semantic domains"
 msgstr ""
@@ -1039,6 +1046,10 @@ msgstr "Ukubwa:"
 msgid "Skip"
 msgstr ""
 
+#: src/project/browse/SearchFilter.svelte
+msgid "Specific field"
+msgstr ""
+
 #: src/project/browse/filter/OpFilter.svelte
 msgid "Starts with"
 msgstr ""
@@ -1219,8 +1230,8 @@ msgstr ""
 msgid "Where are my projects?"
 msgstr ""
 
-#: src/project/browse/SearchFilter.svelte
 #: src/project/browse/EntryMenu.svelte
+#: src/project/browse/filter/FieldSelect.svelte
 #: src/lib/entry-editor/EntryOrSensePicker.svelte
 #: src/lib/entry-editor/EditEntryDialog.svelte
 #: src/lib/entry-editor/object-editors/EntryEditorPrimitive.svelte

From 2cb2cc5d0bb2b468c935ec21edb045e6c828e1b1 Mon Sep 17 00:00:00 2001
From: Tim Haasdyk <tim_haasdyk@sil.org>
Date: Wed, 15 Oct 2025 13:23:51 +0200
Subject: [PATCH 4/7] AI feedback

---
 .../viewer/src/lib/components/field-editors/select.svelte     | 3 ++-
 frontend/viewer/src/lib/components/ui/switch/switch.svelte    | 2 +-
 frontend/viewer/src/project/browse/filter/FieldSelect.svelte  | 3 ++-
 .../src/project/browse/filter/SemanticDomainSelect.svelte     | 4 +++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/frontend/viewer/src/lib/components/field-editors/select.svelte b/frontend/viewer/src/lib/components/field-editors/select.svelte
index 23dc47968c..306c6e0a94 100644
--- a/frontend/viewer/src/lib/components/field-editors/select.svelte
+++ b/frontend/viewer/src/lib/components/field-editors/select.svelte
@@ -126,6 +126,7 @@
       <CommandEmpty>{emptyResultsPlaceholder ?? $t`No items found`}</CommandEmpty>
       <CommandGroup>
         {#if nullOption}
+          {@const selected = value === undefined || value === null}
           <CommandItem
             keywords={[nullOption]}
             onSelect={() => selectValue(undefined)}
@@ -133,7 +134,7 @@
             data-value-index={-1}
             aria-label={nullOption}
           >
-            <Icon icon="i-mdi-check" class={cn('md:hidden', value === null || 'invisible')} />
+            <Icon icon="i-mdi-check" class={cn('md:hidden', selected || 'invisible')} />
             {nullOption}
           </CommandItem>
         {/if}
diff --git a/frontend/viewer/src/lib/components/ui/switch/switch.svelte b/frontend/viewer/src/lib/components/ui/switch/switch.svelte
index b3482e7475..ae31884ff3 100644
--- a/frontend/viewer/src/lib/components/ui/switch/switch.svelte
+++ b/frontend/viewer/src/lib/components/ui/switch/switch.svelte
@@ -20,7 +20,7 @@
     bind:checked
     class={cn(
       'focus-visible:ring-ring focus-visible:ring-offset-background data-[state=checked]:bg-primary data-[state=unchecked]:bg-input peer inline-flex h-6 w-11 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',
-      label || className,
+      !!label || className,
     )}
     {...restProps}
   >
diff --git a/frontend/viewer/src/project/browse/filter/FieldSelect.svelte b/frontend/viewer/src/project/browse/filter/FieldSelect.svelte
index 46bac62561..e7f7a1f2f2 100644
--- a/frontend/viewer/src/project/browse/filter/FieldSelect.svelte
+++ b/frontend/viewer/src/project/browse/filter/FieldSelect.svelte
@@ -1,4 +1,6 @@
 <script lang="ts" module>
+  import type {WritingSystemSelection} from '$lib/writing-system-service.svelte';
+
   export type SelectedField = {
     id: string;
     ws: WritingSystemSelection;
@@ -10,7 +12,6 @@
   import {t} from 'svelte-i18n-lingui';
   import {pt} from '$lib/views/view-text';
   import {useCurrentView} from '$lib/views/view-service';
-  import type {WritingSystemSelection} from '$lib/writing-system-service.svelte';
 
   let {value = $bindable()}: { value: SelectedField | null } = $props();
 
diff --git a/frontend/viewer/src/project/browse/filter/SemanticDomainSelect.svelte b/frontend/viewer/src/project/browse/filter/SemanticDomainSelect.svelte
index f65dd6f09c..d034d95269 100644
--- a/frontend/viewer/src/project/browse/filter/SemanticDomainSelect.svelte
+++ b/frontend/viewer/src/project/browse/filter/SemanticDomainSelect.svelte
@@ -1,4 +1,6 @@
 <script lang="ts" module>
+  import type {WritingSystemSelection} from '$lib/writing-system-service.svelte';
+
   export type SelectedField = {
     id: string;
     ws: WritingSystemSelection;
@@ -6,7 +8,7 @@
 </script>
 
 <script lang="ts">
-  import {useWritingSystemService, type WritingSystemSelection} from '$lib/writing-system-service.svelte';
+  import {useWritingSystemService} from '$lib/writing-system-service.svelte';
   import {useSemanticDomains} from '$lib/semantic-domains';
   import type {ISemanticDomain} from '$lib/dotnet-types';
   import {Select} from '$lib/components/field-editors';

From 08429102455de128b0f57ab550996fa39196b209 Mon Sep 17 00:00:00 2001
From: Tim Haasdyk <tim_haasdyk@sil.org>
Date: Wed, 15 Oct 2025 13:24:13 +0200
Subject: [PATCH 5/7] Stop always expanding filters

---
 frontend/viewer/src/project/browse/SearchFilter.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/viewer/src/project/browse/SearchFilter.svelte b/frontend/viewer/src/project/browse/SearchFilter.svelte
index 81aef9226c..dff1ccaa45 100644
--- a/frontend/viewer/src/project/browse/SearchFilter.svelte
+++ b/frontend/viewer/src/project/browse/SearchFilter.svelte
@@ -83,7 +83,7 @@
     return v.replace(/([(),|\\]|\/i)/g, '\\$1');
   }
 
-  let filtersExpanded = $state(true);
+  let filtersExpanded = $state(false);
 </script>
 
 {#snippet placeholder()}

From 504979bb2df58354823edfe33638ed80173932e2 Mon Sep 17 00:00:00 2001
From: Tim Haasdyk <tim_haasdyk@sil.org>
Date: Wed, 15 Oct 2025 13:24:39 +0200
Subject: [PATCH 6/7] Ensure default field selection is pushed to parent

---
 .../src/project/browse/filter/FieldSelect.svelte     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/frontend/viewer/src/project/browse/filter/FieldSelect.svelte b/frontend/viewer/src/project/browse/filter/FieldSelect.svelte
index e7f7a1f2f2..15c708fb3a 100644
--- a/frontend/viewer/src/project/browse/filter/FieldSelect.svelte
+++ b/frontend/viewer/src/project/browse/filter/FieldSelect.svelte
@@ -13,18 +13,22 @@
   import {pt} from '$lib/views/view-text';
   import {useCurrentView} from '$lib/views/view-service';
 
-  let {value = $bindable()}: { value: SelectedField | null } = $props();
-
-  type LabeledSelectedField = SelectedField & { label: string };
-
   const currentView = useCurrentView();
   let fields: LabeledSelectedField[] = $derived([
     { id: 'lexemeForm', label: pt($t`Lexeme Form`, $t`Word`, $currentView), ws: 'vernacular-no-audio' },
     { id: 'citationForm', label: pt($t`Citation Form`, $t`Display as`, $currentView), ws: 'vernacular-no-audio' },
     { id: 'senses.gloss', label: $t`Gloss`, ws: 'analysis-no-audio' },
   ]);
+
+  let {value = $bindable()}: { value: SelectedField | null } = $props();
+
+  type LabeledSelectedField = SelectedField & { label: string };
+
   const labeledValue = $derived(fields.find(f => f.id === value?.id) ?? fields[0]);
+  // svelte-ignore state_referenced_locally
+  value ??= labeledValue;
 </script>
+
 <Select.Root type="single" bind:value={() => (value ?? fields[0]).id, (newId) => value = fields.find(f => f.id === newId) ?? fields[0]}>
   <Select.Trigger class="flex-1">
     {labeledValue.label}

From 0aebc729ad56377d7e0b34c5b29e7fe8819f9a5a Mon Sep 17 00:00:00 2001
From: Tim Haasdyk <tim_haasdyk@sil.org>
Date: Wed, 15 Oct 2025 13:24:54 +0200
Subject: [PATCH 7/7] Disabled ws-select if no type is provided

---
 frontend/viewer/src/project/browse/SearchFilter.svelte    | 2 +-
 frontend/viewer/src/project/browse/filter/WsSelect.svelte | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/viewer/src/project/browse/SearchFilter.svelte b/frontend/viewer/src/project/browse/SearchFilter.svelte
index dff1ccaa45..478d25b2ed 100644
--- a/frontend/viewer/src/project/browse/SearchFilter.svelte
+++ b/frontend/viewer/src/project/browse/SearchFilter.svelte
@@ -123,7 +123,7 @@
           <!-- Field Picker -->
           <FieldSelect bind:value={selectedField} />
           <!-- Writing System Picker -->
-          <WsSelect bind:value={selectedWs} wsType={selectedField?.ws ?? 'analysis-vernacular'} />
+          <WsSelect bind:value={selectedWs} wsType={selectedField?.ws} />
         </div>
         <!-- Text Box: on mobile, wraps to new line -->
         <div class="flex flex-row gap-2 flex-1">
diff --git a/frontend/viewer/src/project/browse/filter/WsSelect.svelte b/frontend/viewer/src/project/browse/filter/WsSelect.svelte
index f5354a2c25..2bb0dc78a3 100644
--- a/frontend/viewer/src/project/browse/filter/WsSelect.svelte
+++ b/frontend/viewer/src/project/browse/filter/WsSelect.svelte
@@ -6,13 +6,13 @@
 
   const wsService = useWritingSystemService();
 
-  let {value = $bindable(), wsType}: { value: string[], wsType: WritingSystemSelection } = $props();
-  let writingSystems = $derived(wsService.pickWritingSystems(wsType));
+  let {value = $bindable(), wsType}: { value: string[], wsType: WritingSystemSelection | undefined } = $props();
+  let writingSystems = $derived(wsType ? wsService.pickWritingSystems(wsType) : []);
   watch(() => writingSystems, () => {
     value = writingSystems.map(ws => ws.wsId);
   });
 </script>
-<Select.Root type="multiple" bind:value>
+<Select.Root disabled={!wsType} type="multiple" bind:value>
   <Select.Trigger class="flex-1">
     {#if value.length === 0}
       <span class="text-muted-foreground">{$t`Writing System`}</span>