diff --git a/i18n/en.json b/i18n/en.json
index 42965e06a8..6a73479ef0 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,4 +1,5 @@
 {
+  "metadata": "Metadata",
   "about": "About",
   "account": "Account",
   "account_settings": "Account Settings",
@@ -756,6 +757,7 @@
   "connected_device": "Connected device",
   "connected_to": "Connected to",
   "contain": "Contain",
+  "content": "Content",
   "context": "Context",
   "continue": "Continue",
   "control_bottom_app_bar_create_new_album": "Create new album",
diff --git a/web/src/lib/components/shared-components/search-bar/search-filter-group.svelte b/web/src/lib/components/shared-components/search-bar/search-filter-group.svelte
new file mode 100644
index 0000000000..ddeb4ecce6
--- /dev/null
+++ b/web/src/lib/components/shared-components/search-bar/search-filter-group.svelte
@@ -0,0 +1,25 @@
+<script lang="ts">
+  import type { Snippet } from 'svelte';
+
+  interface Props {
+    title: string;
+    columns?: 1 | 2;
+    children?: Snippet;
+  }
+
+  let { title, columns = 1, children }: Props = $props();
+</script>
+
+<fieldset>
+  <legend class="mb-3 text-xs font-semibold uppercase tracking-wider text-gray-400 dark:text-gray-500">
+    {title}
+  </legend>
+
+  <div
+    class="grid gap-3"
+    class:grid-cols-1={columns === 1}
+    class:md:grid-cols-2={columns === 2}
+  >
+    {@render children?.()}
+  </div>
+</fieldset>
diff --git a/web/src/lib/components/shared-components/search-bar/search-filter-section.svelte b/web/src/lib/components/shared-components/search-bar/search-filter-section.svelte
index ef747a1b0f..0bcae6abce 100644
--- a/web/src/lib/components/shared-components/search-bar/search-filter-section.svelte
+++ b/web/src/lib/components/shared-components/search-bar/search-filter-section.svelte
@@ -1,56 +1,23 @@
 <script lang="ts">
   import { Icon } from '@immich/ui';
-  import { mdiChevronDown } from '@mdi/js';
   import type { Snippet } from 'svelte';
-  import { slide } from 'svelte/transition';
 
   interface Props {
     title: string;
     icon: string;
-    expanded?: boolean;
     children?: Snippet;
-    isFirst?: boolean;
-    isLast?: boolean;
   }
 
-  let { title, icon, expanded = $bindable(false), children, isFirst = false, isLast = false }: Props = $props();
+  let { title, icon, children }: Props = $props();
 </script>
 
-<div
-  class="border border-gray-200 dark:border-gray-700 overflow-hidden transition-all duration-200"
-  class:rounded-t-2xl={isFirst}
-  class:rounded-b-2xl={isLast}
->
-  <button
-    type="button"
-    aria-expanded={expanded}
-    onclick={() => (expanded = !expanded)}
-    class="flex w-full items-center justify-between gap-3 px-4 py-3 text-start bg-light-50 hover:bg-primary-50 dark:hover:bg-gray-800 transition-colors"
-    class:bg-light-200={expanded}
-  >
-    <div class="flex items-center gap-3">
-      <div
-        class="flex items-center justify-center w-8 h-8 rounded-lg bg-immich-primary/10 dark:bg-immich-dark-primary/20"
-      >
-        <Icon {icon} size="18" class="text-immich-primary dark:text-immich-dark-primary" />
-      </div>
-      <span class="font-medium text-gray-900 dark:text-gray-100">{title}</span>
-    </div>
+<section class="rounded-xl border border-gray-200 bg-white p-4 dark:border-gray-700 dark:bg-gray-800/50">
+  <header class="mb-3 flex items-center gap-2">
+    <Icon {icon} size="18" class="text-immich-primary dark:text-immich-dark-primary" />
+    <h3 class="text-sm font-medium text-gray-700 dark:text-gray-200">{title}</h3>
+  </header>
 
-    <div
-      class="flex items-center justify-center w-7 h-7 rounded-full hover:bg-gray-200 dark:hover:bg-gray-700 transition-colors"
-    >
-      <Icon
-        icon={mdiChevronDown}
-        size="20"
-        class="text-gray-500 dark:text-gray-400 transition-transform duration-200 {expanded ? 'rotate-180' : ''}"
-      />
-    </div>
-  </button>
-
-  {#if expanded}
-    <div transition:slide={{ duration: 150 }} class="px-4 py-4">
-      {@render children?.()}
-    </div>
-  {/if}
-</div>
+  <div>
+    {@render children?.()}
+  </div>
+</section>
diff --git a/web/src/lib/modals/SearchFilterModal.svelte b/web/src/lib/modals/SearchFilterModal.svelte
index e190377779..510c9e78f6 100644
--- a/web/src/lib/modals/SearchFilterModal.svelte
+++ b/web/src/lib/modals/SearchFilterModal.svelte
@@ -25,12 +25,12 @@
   } from '$lib/components/shared-components/search-bar/search-camera-section.svelte';
   import SearchDateSection from '$lib/components/shared-components/search-bar/search-date-section.svelte';
   import SearchDisplaySection from '$lib/components/shared-components/search-bar/search-display-section.svelte';
+  import SearchFilterGroup from '$lib/components/shared-components/search-bar/search-filter-group.svelte';
   import SearchFilterSection from '$lib/components/shared-components/search-bar/search-filter-section.svelte';
   import SearchLocationSection from '$lib/components/shared-components/search-bar/search-location-section.svelte';
   import SearchMediaSection from '$lib/components/shared-components/search-bar/search-media-section.svelte';
   import SearchPeopleSection from '$lib/components/shared-components/search-bar/search-people-section.svelte';
   import SearchRatingsSection from '$lib/components/shared-components/search-bar/search-ratings-section.svelte';
-  import SearchTagsSection from '$lib/components/shared-components/search-bar/search-tags-section.svelte';
   import SearchTextSection from '$lib/components/shared-components/search-bar/search-text-section.svelte';
   import { preferences } from '$lib/stores/user.store';
   import { parseUtcDate } from '$lib/utils/date-time';
@@ -46,7 +46,6 @@
     mdiMagnify,
     mdiMapMarker,
     mdiStar,
-    mdiTag,
     mdiTune,
   } from '@mdi/js';
   import { t } from 'svelte-i18n';
@@ -199,62 +198,54 @@
 <Modal icon={mdiTune} size="giant" title={$t('search_options')} {onClose}>
   <ModalBody>
     <form id={formId} autocomplete="off" {onsubmit} {onreset}>
-      <div class="flex flex-col gap-0" tabindex="-1">
-        <!-- TEXT -->
-        <SearchFilterSection title={$t('search_type')} icon={mdiMagnify} isFirst expanded>
-          <SearchTextSection bind:query={filter.query} bind:queryType={filter.queryType} />
-        </SearchFilterSection>
-
-        <!-- PEOPLE -->
-        <SearchFilterSection title={$t('people')} icon={mdiAccountMultiple}>
-          <SearchPeopleSection bind:selectedPeople={filter.personIds} />
-        </SearchFilterSection>
-
-        <!-- TAGS -->
-        <SearchFilterSection title={$t('tags')} icon={mdiTag}>
-          <SearchTagsSection bind:selectedTags={filter.tagIds} />
-        </SearchFilterSection>
-
-        <!-- LOCATION -->
-        <SearchFilterSection title={$t('place')} icon={mdiMapMarker}>
-          <SearchLocationSection bind:filters={filter.location} />
-        </SearchFilterSection>
-
-        <!-- CAMERA MODEL -->
-        <SearchFilterSection title={$t('camera')} icon={mdiCamera}>
-          <SearchCameraSection bind:filters={filter.camera} />
-        </SearchFilterSection>
-
-        <!-- DATE RANGE -->
-        <SearchFilterSection title={$t('date_range')} icon={mdiCalendarRange}>
-          <SearchDateSection bind:filters={filter.date} />
-        </SearchFilterSection>
-
-        <!-- RATING -->
-        {#if $preferences?.ratings.enabled}
-          <SearchFilterSection title={$t('rating')} icon={mdiStar}>
-            <SearchRatingsSection bind:rating={filter.rating} />
+      <div class="flex flex-col gap-6" tabindex="-1">
+        <SearchFilterGroup title={$t('content')}>
+          <SearchFilterSection title={$t('search_type')} icon={mdiMagnify}>
+            <SearchTextSection bind:query={filter.query} bind:queryType={filter.queryType} />
           </SearchFilterSection>
-        {/if}
 
-        <!-- MEDIA TYPE & DISPLAY OPTIONS -->
-        <SearchFilterSection title={$t('media_type')} icon={mdiImageMultiple}>
-          <SearchMediaSection bind:filteredMedia={filter.mediaType} />
-        </SearchFilterSection>
+          <SearchFilterSection title={$t('people')} icon={mdiAccountMultiple}>
+            <SearchPeopleSection bind:selectedPeople={filter.personIds} />
+          </SearchFilterSection>
+        </SearchFilterGroup>
 
-        <SearchFilterSection title={$t('display_options')} icon={mdiCog} isLast>
-          <SearchDisplaySection bind:filters={filter.display} />
-        </SearchFilterSection>
+        <SearchFilterGroup title={$t('metadata')} columns={2}>
+          <SearchFilterSection title={$t('place')} icon={mdiMapMarker}>
+            <SearchLocationSection bind:filters={filter.location} />
+          </SearchFilterSection>
+
+          <SearchFilterSection title={$t('camera')} icon={mdiCamera}>
+            <SearchCameraSection bind:filters={filter.camera} />
+          </SearchFilterSection>
+
+          <SearchFilterSection title={$t('date_range')} icon={mdiCalendarRange}>
+            <SearchDateSection bind:filters={filter.date} />
+          </SearchFilterSection>
+
+          {#if $preferences?.ratings.enabled}
+            <SearchFilterSection title={$t('rating')} icon={mdiStar}>
+              <SearchRatingsSection bind:rating={filter.rating} />
+            </SearchFilterSection>
+          {/if}
+        </SearchFilterGroup>
+
+        <SearchFilterGroup title={$t('options')} columns={2}>
+          <SearchFilterSection title={$t('media_type')} icon={mdiImageMultiple}>
+            <SearchMediaSection bind:filteredMedia={filter.mediaType} />
+          </SearchFilterSection>
+
+          <SearchFilterSection title={$t('display_options')} icon={mdiCog}>
+            <SearchDisplaySection bind:filters={filter.display} />
+          </SearchFilterSection>
+        </SearchFilterGroup>
       </div>
     </form>
   </ModalBody>
 
   <ModalFooter>
     <HStack fullWidth>
-      <Button shape="round" size="large" type="reset" color="secondary" fullWidth form={formId}
-        >{$t('clear_all')}</Button
-      >
-      <Button shape="round" size="large" type="submit" fullWidth form={formId}>{$t('search')}</Button>
+      <Button shape="round" type="reset" color="secondary" fullWidth form={formId}>{$t('clear_all')}</Button>
+      <Button shape="round" type="submit" fullWidth form={formId}>{$t('search')}</Button>
     </HStack>
   </ModalFooter>
 </Modal>