diff --git a/src/components/VErrorSection/meta/VErrorSection.stories.mdx b/src/components/VErrorSection/meta/VErrorSection.stories.mdx
index 1a0fc0cab2..5b1d028d52 100644
--- a/src/components/VErrorSection/meta/VErrorSection.stories.mdx
+++ b/src/components/VErrorSection/meta/VErrorSection.stories.mdx
@@ -51,7 +51,6 @@ export const NoResultsTemplate = (args) => ({
         license_type: "",
         mature: false,
         q: "sad person",
-        searchBy: "",
       },
     }}
   >
diff --git a/src/components/VExternalSearch/VExternalSearchForm.vue b/src/components/VExternalSearch/VExternalSearchForm.vue
index 2e837bac22..7cf8b60627 100644
--- a/src/components/VExternalSearch/VExternalSearchForm.vue
+++ b/src/components/VExternalSearch/VExternalSearchForm.vue
@@ -175,7 +175,6 @@ export default defineComponent({
     /**
      * Find the last focusable element in VSearchGridFilter to add a 'Tab' keydown event
      * handler to it.
-     * We could actually hard-code this because 'searchBy' is always the last now.
      */
     const lastFocusableElement = computed<HTMLElement>(() => {
       const focusable = getFocusableElements(sectionRef.value)
diff --git a/src/components/VFilters/VFilterChecklist.vue b/src/components/VFilters/VFilterChecklist.vue
index 9baa315f8a..4e1bce9192 100644
--- a/src/components/VFilters/VFilterChecklist.vue
+++ b/src/components/VFilters/VFilterChecklist.vue
@@ -1,8 +1,6 @@
 <template>
   <fieldset class="mb-8">
-    <legend v-if="title" class="text-sm font-semibold">
-      {{ title }}
-    </legend>
+    <legend class="label-bold">{{ title }}</legend>
     <div
       v-for="(item, index) in options"
       :key="index"
@@ -12,7 +10,7 @@
         :id="item.code"
         :key="index"
         :checked="item.checked"
-        :name="itemName"
+        :name="title"
         :value="item.code"
         :disabled="isDisabled(item)"
         @change="onValueChange"
@@ -57,7 +55,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, PropType } from "@nuxtjs/composition-api"
+import { defineComponent, PropType } from "@nuxtjs/composition-api"
 
 import { useSearchStore } from "~/stores/search"
 import { useI18n } from "~/composables/use-i18n"
@@ -114,11 +112,6 @@ export default defineComponent({
   },
   setup(props, { emit }) {
     const i18n = useI18n()
-    const itemName = computed(() => {
-      return props.filterType === "searchBy"
-        ? i18n.t("filters.search-by.title")
-        : props.title
-    })
 
     const itemLabel = (item: FilterItem) =>
       ["audioProviders", "imageProviders"].indexOf(props.filterType) > -1
@@ -149,7 +142,6 @@ export default defineComponent({
 
     return {
       icons,
-      itemName,
       isDisabled,
       itemLabel,
       onValueChange,
diff --git a/src/components/VFilters/VSearchGridFilter.vue b/src/components/VFilters/VSearchGridFilter.vue
index e5f15af286..3fce2b65fa 100644
--- a/src/components/VFilters/VSearchGridFilter.vue
+++ b/src/components/VFilters/VSearchGridFilter.vue
@@ -108,9 +108,7 @@ export default defineComponent({
       () => Object.keys(filters.value) as NonMatureFilterCategory[]
     )
     const filterTypeTitle = (filterType: string) =>
-      filterType === "searchBy"
-        ? ""
-        : i18n.t(`filters.${kebab(filterType)}.title`)
+      i18n.t(`filters.${kebab(filterType)}.title`)
 
     /**
      * This watcher fires even when the queries are equal. We update the path only
diff --git a/src/stores/search.ts b/src/stores/search.ts
index b6bc3e81cc..d3b6a10712 100644
--- a/src/stores/search.ts
+++ b/src/stores/search.ts
@@ -124,11 +124,14 @@ export const useSearchStore = defineStore("search", {
     },
 
     /**
-     * Returns the object with filters for selected search type, with codes, names for i18n labels, and checked status.
+     * Returns the object with filters for selected search type,
+     * with codes, names for i18n labels, and checked status.
+     *
+     * Excludes `searchBy` and `mature` filters that we don't display.
      */
     searchFilters(state) {
       return mediaFilterKeys[state.searchType]
-        .filter((filterKey) => filterKey !== "mature")
+        .filter((filterKey) => !["searchBy", "mature"].includes(filterKey))
         .reduce((obj, filterKey) => {
           obj[filterKey] = this.filters[filterKey]
           return obj
diff --git a/test/playwright/e2e/filters-old.spec.ts b/test/playwright/e2e/filters-old.spec.ts
deleted file mode 100644
index b3549bacdb..0000000000
--- a/test/playwright/e2e/filters-old.spec.ts
+++ /dev/null
@@ -1,198 +0,0 @@
-import { expect, Page, test } from "@playwright/test"
-
-import {
-  assertCheckboxStatus,
-  changeContentType,
-  goToSearchTerm,
-  OLD_HEADER,
-  openFilters,
-} from "~~/test/playwright/utils/navigation"
-
-import { mockProviderApis } from "~~/test/playwright/utils/route"
-
-import {
-  ALL_MEDIA,
-  AUDIO,
-  IMAGE,
-  supportedSearchTypes,
-} from "~/constants/media"
-
-test.describe.configure({ mode: "parallel" })
-
-test.beforeEach(async ({ context }) => {
-  await mockProviderApis(context)
-})
-
-const assertCheckboxCount = async (
-  page: Page,
-  checked: "checked" | "notChecked" | "total",
-  count: number
-) => {
-  const checkedString = {
-    checked: ":checked",
-    notChecked: ":not(:checked)",
-    total: "",
-  }[checked]
-  const locatorString = `input[type="checkbox"]${checkedString}`
-  await expect(page.locator(locatorString)).toHaveCount(count, { timeout: 200 })
-}
-
-const FILTER_COUNTS = {
-  [ALL_MEDIA]: 11,
-  [AUDIO]: 32,
-  [IMAGE]: 70,
-}
-
-for (const searchType of supportedSearchTypes) {
-  test(`correct total number of filters is displayed for ${searchType}`, async ({
-    page,
-  }) => {
-    await goToSearchTerm(page, "cat", { searchType })
-
-    await openFilters(page, OLD_HEADER)
-
-    await assertCheckboxCount(page, "total", FILTER_COUNTS[searchType])
-  })
-}
-
-test("initial filters are applied based on the url", async ({ page }) => {
-  await page.goto(
-    "/search/?q=cat&license_type=commercial&license=cc0&searchBy=creator"
-  )
-  await openFilters(page, OLD_HEADER)
-  const expectedFilters = ["cc0", "commercial", "creator"]
-
-  for (const checkbox of expectedFilters) {
-    await assertCheckboxStatus(page, checkbox)
-  }
-})
-
-test("common filters are retained when media type changes from all media to single type", async ({
-  page,
-}) => {
-  await page.goto(
-    "/search/?q=cat&license_type=commercial&license=cc0&searchBy=creator"
-  )
-  await openFilters(page, OLD_HEADER)
-  const expectedFilters = ["cc0", "commercial", "creator"]
-
-  for (const checkbox of expectedFilters) {
-    await assertCheckboxStatus(page, checkbox)
-  }
-  await changeContentType(page, "Images", OLD_HEADER)
-
-  await expect(page).toHaveURL(
-    "/search/image?q=cat&license_type=commercial&license=cc0&searchBy=creator"
-  )
-  for (const checkbox of expectedFilters) {
-    await assertCheckboxStatus(page, checkbox)
-  }
-})
-
-test("common filters are retained when media type changes from single type to all media", async ({
-  page,
-}) => {
-  await page.goto(
-    "/search/image?q=cat&license_type=commercial&license=cc0&searchBy=creator"
-  )
-  await openFilters(page, OLD_HEADER)
-
-  for (const checkbox of ["cc0", "commercial", "creator"]) {
-    await assertCheckboxStatus(page, checkbox)
-  }
-
-  await changeContentType(page, "All content", OLD_HEADER)
-
-  for (const checkbox of ["cc0", "commercial", "creator"]) {
-    await assertCheckboxStatus(page, checkbox)
-  }
-  await expect(page).toHaveURL(
-    "/search/?q=cat&license_type=commercial&license=cc0&searchBy=creator"
-  )
-})
-
-test("selecting some filters can disable dependent filters", async ({
-  page,
-}) => {
-  await page.goto("/search/audio?q=cat&license_type=commercial")
-  await openFilters(page, OLD_HEADER)
-
-  // by-nc is special because we normally test for fuzzy match, and by-nc matches 3 labels.
-  const byNc = page.locator('input[value="by-nc"]')
-  await expect(byNc).toBeDisabled()
-  for (const checkbox of ["by-nc-sa", "by-nc-nd"]) {
-    await assertCheckboxStatus(page, checkbox, "", "disabled")
-  }
-  await assertCheckboxStatus(page, "commercial")
-
-  await page.click('label:has-text("commercial")')
-
-  await assertCheckboxStatus(page, "commercial", "", "unchecked")
-  await expect(byNc).not.toBeDisabled()
-  for (const checkbox of ["commercial", "by-nc-sa", "by-nc-nd"]) {
-    await assertCheckboxStatus(page, checkbox, "", "unchecked")
-  }
-})
-
-/**
- * When the search type changes:
- * - image-specific filter (aspect_ration=tall) is discarded
- * - common filter (license_type=CC0) is kept
- * - filter button text updates
- * - URL updates
- * Tests for the missing checkbox with `toHaveCount` are flaky, so we use filter button
- * text and the URL instead.
- */
-test("filters are updated when media type changes", async ({ page }) => {
-  await page.goto("/search/image?q=cat&aspect_ratio=tall&license=cc0")
-  await openFilters(page, OLD_HEADER)
-
-  await assertCheckboxStatus(page, "tall")
-  await assertCheckboxStatus(page, "cc0")
-
-  await changeContentType(page, "Audio", OLD_HEADER)
-
-  // Only CC0 checkbox is checked, and the filter button label is '1 Filter'
-  await assertCheckboxStatus(page, "cc0")
-  await expect(
-    page.locator('[aria-controls="filters"] span:visible')
-  ).toHaveText("1 Filter")
-
-  await expect(page).toHaveURL("/search/audio?q=cat&license=cc0")
-})
-
-test("new media request is sent when a filter is selected", async ({
-  page,
-}) => {
-  await page.goto("/search/image?q=cat")
-  await openFilters(page, OLD_HEADER)
-
-  await assertCheckboxStatus(page, "cc0", "", "unchecked")
-
-  const [response] = await Promise.all([
-    page.waitForResponse((response) => response.url().includes("cc0")),
-    page.click('label:has-text("CC0")'),
-  ])
-
-  await assertCheckboxStatus(page, "cc0")
-  // Remove the host url and path because when proxied, the 'http://localhost:49153' is used instead of the
-  // real API url
-  const queryString = response.url().split("/images/")[1]
-  expect(queryString).toEqual("?q=cat&license=cc0")
-})
-
-for (const [searchType, source] of [
-  ["audio", "Freesound"],
-  ["image", "Flickr"],
-]) {
-  test(`Provider filters are correctly initialized from the URL: ${source} - ${searchType}`, async ({
-    page,
-  }) => {
-    await page.goto(
-      `/search/${searchType}?q=birds&source=${source.toLowerCase()}`
-    )
-    await openFilters(page, OLD_HEADER)
-
-    await assertCheckboxStatus(page, source, "", "checked")
-  })
-}
diff --git a/test/playwright/e2e/filters.spec.ts b/test/playwright/e2e/filters.spec.ts
index bd872556e5..704427729e 100644
--- a/test/playwright/e2e/filters.spec.ts
+++ b/test/playwright/e2e/filters.spec.ts
@@ -38,9 +38,9 @@ const assertCheckboxCount = async (
 }
 
 const FILTER_COUNTS = {
-  [ALL_MEDIA]: 11,
-  [AUDIO]: 32,
-  [IMAGE]: 70,
+  [ALL_MEDIA]: 10,
+  [AUDIO]: 31,
+  [IMAGE]: 69,
 }
 
 breakpoints.describeMobileAndDesktop(() => {
@@ -65,7 +65,8 @@ breakpoints.describeMobileAndDesktop(() => {
       "/search/?q=cat&license_type=commercial&license=cc0&searchBy=creator"
     )
     await openFilters(page)
-    const expectedFilters = ["cc0", "commercial", "creator"]
+    // Creator filter was removed from the UI
+    const expectedFilters = ["cc0", "commercial"]
 
     for (const checkbox of expectedFilters) {
       await assertCheckboxStatus(page, checkbox)
@@ -79,7 +80,8 @@ breakpoints.describeMobileAndDesktop(() => {
       "/search/?q=cat&license_type=commercial&license=cc0&searchBy=creator"
     )
     await openFilters(page)
-    const expectedFilters = ["cc0", "commercial", "creator"]
+    // Creator filter was removed from the UI
+    const expectedFilters = ["cc0", "commercial"]
 
     for (const checkbox of expectedFilters) {
       await assertCheckboxStatus(page, checkbox)
@@ -103,14 +105,15 @@ breakpoints.describeMobileAndDesktop(() => {
     )
     await openFilters(page)
 
-    for (const checkbox of ["cc0", "commercial", "creator"]) {
+    // Creator filter was removed from the UI
+    for (const checkbox of ["cc0", "commercial"]) {
       await assertCheckboxStatus(page, checkbox)
     }
 
     await changeContentType(page, "All content")
 
     await openFilters(page)
-    await expect(page.locator('input[type="checkbox"]:checked')).toHaveCount(3)
+    await expect(page.locator('input[type="checkbox"]:checked')).toHaveCount(2)
 
     await expect(page).toHaveURL(
       "/search/?q=cat&license_type=commercial&license=cc0&searchBy=creator"
diff --git a/test/playwright/e2e/search-query-server-old.spec.ts b/test/playwright/e2e/search-query-server-old.spec.ts
deleted file mode 100644
index 6e6957104e..0000000000
--- a/test/playwright/e2e/search-query-server-old.spec.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { test, expect } from "@playwright/test"
-
-import {
-  assertCheckboxStatus,
-  currentContentType,
-  goToSearchTerm,
-  OLD_HEADER,
-  openFilters,
-} from "~~/test/playwright/utils/navigation"
-import { mockProviderApis } from "~~/test/playwright/utils/route"
-
-import { AUDIO, IMAGE } from "~/constants/media"
-
-/**
- * URL is correctly converted into search state:
- * 1. `q` parameter is set as the search input value
- * 2. /search/<path>?query - path is used to choose the content type
- * 3. query parameters are used to set the filter data:
- * 3a. One of each values for `all` content
- * 3b. Several query values - several filter checkboxes
- * 3c. Mature filter
- * 3d. Query parameters that are not used for current media type are discarded
- * All of these tests test server-generated search page, not the one generated on the client
- */
-
-test.describe.configure({ mode: "parallel" })
-
-test.beforeEach(async ({ context }) => {
-  await mockProviderApis(context)
-})
-
-test("q query parameter is set as the search term", async ({ page }) => {
-  await goToSearchTerm(page, "cat", {
-    query: "license=cc0&license_type=commercial&searchBy=creator",
-  })
-
-  const searchInput = page.locator('input[type="search"]')
-  await expect(searchInput).toHaveValue("cat")
-  // Todo: focus the input?
-  // await expect(searchInput).toBeFocused()
-})
-
-test("url path /search/ is used to select `all` search tab", async ({
-  page,
-}) => {
-  await page.goto("/search/?q=cat")
-
-  const contentType = await currentContentType(page, OLD_HEADER)
-  expect(contentType?.trim()).toEqual("All content")
-})
-
-test("url path /search/audio is used to select `audio` search tab", async ({
-  page,
-}) => {
-  await goToSearchTerm(page, "cat", {
-    searchType: AUDIO,
-    headerMode: OLD_HEADER,
-  })
-
-  const contentType = await currentContentType(page, OLD_HEADER)
-  expect(contentType?.trim()).toEqual("Audio")
-})
-
-test("url query to filter, all tab, one parameter per filter type", async ({
-  page,
-}) => {
-  await goToSearchTerm(page, "cat", {
-    query: "license=cc0&license_type=commercial&searchBy=creator",
-  })
-
-  await openFilters(page, OLD_HEADER)
-  for (const checkbox of ["cc0", "commercial", "creator"]) {
-    await assertCheckboxStatus(page, checkbox)
-  }
-})
-
-test("url query to filter, image tab, several filters for one filter type selected", async ({
-  page,
-}) => {
-  await goToSearchTerm(page, "cat", {
-    searchType: IMAGE,
-    query: "searchBy=creator&extension=jpg,png,gif,svg",
-    headerMode: OLD_HEADER,
-  })
-  await openFilters(page, OLD_HEADER)
-  const checkboxes = ["jpeg", "png", "gif", "svg"]
-  for (const checkbox of checkboxes) {
-    const forValue = checkbox === "jpeg" ? "jpg" : checkbox
-    await assertCheckboxStatus(page, checkbox, forValue)
-  }
-})
-
-test.skip("url mature query is set, and can be unchecked using the Safer Browsing popup", async ({
-  page,
-}) => {
-  await goToSearchTerm(page, "cat", {
-    searchType: IMAGE,
-    query: "mature=true",
-    headerMode: OLD_HEADER,
-  })
-
-  await page.click('button:has-text("Safer Browsing")')
-
-  const matureCheckbox = await page.locator("text=Show Mature Content")
-  await expect(matureCheckbox).toBeChecked()
-
-  await page.click("text=Show Mature Content")
-  await expect(page).toHaveURL("/search/image?q=cat")
-})
diff --git a/test/playwright/e2e/search-query-server.spec.ts b/test/playwright/e2e/search-query-server.spec.ts
index 798ccbf3f8..5e4b4df653 100644
--- a/test/playwright/e2e/search-query-server.spec.ts
+++ b/test/playwright/e2e/search-query-server.spec.ts
@@ -71,7 +71,8 @@ test.describe("search query on SSR", () => {
       })
 
       await openFilters(page)
-      for (const checkbox of ["cc0", "commercial", "creator"]) {
+      // Creator filter was removed from the UI
+      for (const checkbox of ["cc0", "commercial"]) {
         await assertCheckboxStatus(page, checkbox)
       }
     })
diff --git a/test/playwright/visual-regression/components/filters-sidebar.spec.ts-snapshots/filters-sidebar-filters-selected-rtl-linux.png b/test/playwright/visual-regression/components/filters-sidebar.spec.ts-snapshots/filters-sidebar-filters-selected-rtl-linux.png
new file mode 100644
index 0000000000..70148e4d5f
Binary files /dev/null and b/test/playwright/visual-regression/components/filters-sidebar.spec.ts-snapshots/filters-sidebar-filters-selected-rtl-linux.png differ
diff --git a/test/playwright/visual-regression/components/filters.spec.ts-snapshots/filters-sidebar-checked-ltr-linux.png b/test/playwright/visual-regression/components/filters.spec.ts-snapshots/filters-sidebar-checked-ltr-linux.png
index d96a8d5cc8..2355b90149 100644
Binary files a/test/playwright/visual-regression/components/filters.spec.ts-snapshots/filters-sidebar-checked-ltr-linux.png and b/test/playwright/visual-regression/components/filters.spec.ts-snapshots/filters-sidebar-checked-ltr-linux.png differ
diff --git a/test/playwright/visual-regression/components/filters.spec.ts-snapshots/filters-sidebar-checked-rtl-linux.png b/test/playwright/visual-regression/components/filters.spec.ts-snapshots/filters-sidebar-checked-rtl-linux.png
index b7904e01d8..f525ff577f 100644
Binary files a/test/playwright/visual-regression/components/filters.spec.ts-snapshots/filters-sidebar-checked-rtl-linux.png and b/test/playwright/visual-regression/components/filters.spec.ts-snapshots/filters-sidebar-checked-rtl-linux.png differ
diff --git a/test/playwright/visual-regression/components/filters.spec.ts-snapshots/filters-sidebar-ltr-linux.png b/test/playwright/visual-regression/components/filters.spec.ts-snapshots/filters-sidebar-ltr-linux.png
index c9f4520958..842d778bd0 100644
Binary files a/test/playwright/visual-regression/components/filters.spec.ts-snapshots/filters-sidebar-ltr-linux.png and b/test/playwright/visual-regression/components/filters.spec.ts-snapshots/filters-sidebar-ltr-linux.png differ
diff --git a/test/playwright/visual-regression/components/filters.spec.ts-snapshots/filters-sidebar-rtl-linux.png b/test/playwright/visual-regression/components/filters.spec.ts-snapshots/filters-sidebar-rtl-linux.png
index 5ee951e360..5e39193daa 100644
Binary files a/test/playwright/visual-regression/components/filters.spec.ts-snapshots/filters-sidebar-rtl-linux.png and b/test/playwright/visual-regression/components/filters.spec.ts-snapshots/filters-sidebar-rtl-linux.png differ
diff --git a/test/playwright/visual-regression/pages/pages.spec.ts-snapshots/search-page-rtl-lg-linux.png b/test/playwright/visual-regression/pages/pages.spec.ts-snapshots/search-page-rtl-lg-linux.png
index dd04bbd1b0..ba511926cf 100644
Binary files a/test/playwright/visual-regression/pages/pages.spec.ts-snapshots/search-page-rtl-lg-linux.png and b/test/playwright/visual-regression/pages/pages.spec.ts-snapshots/search-page-rtl-lg-linux.png differ
diff --git a/test/unit/specs/components/v-search-grid-filter.spec.js b/test/unit/specs/components/v-search-grid-filter.spec.js
index 68e13b1fc9..3c55a4d8e9 100644
--- a/test/unit/specs/components/v-search-grid-filter.spec.js
+++ b/test/unit/specs/components/v-search-grid-filter.spec.js
@@ -72,6 +72,6 @@ describe("VSearchGridFilter", () => {
 
     expect(checkedFilters.length).toEqual(0)
     // Filters are reset with the initial `filterData` for ALL_MEDIA
-    expect(uncheckedFilters.length).toEqual(11)
+    expect(uncheckedFilters.length).toEqual(10)
   })
 })
diff --git a/test/unit/specs/stores/search-store.spec.js b/test/unit/specs/stores/search-store.spec.js
index ec54b6dc23..74034d1764 100644
--- a/test/unit/specs/stores/search-store.spec.js
+++ b/test/unit/specs/stores/search-store.spec.js
@@ -79,7 +79,7 @@ describe("Search Store", () => {
         const searchStore = useSearchStore()
         searchStore.setSearchType(searchType)
         const filtersForDisplay = searchStore.searchFilters
-        const expectedFilterCount = Math.max(0, filterTypeCount - 1)
+        const expectedFilterCount = Math.max(0, filterTypeCount - 2)
         expect(Object.keys(filtersForDisplay).length).toEqual(
           expectedFilterCount
         )