diff --git a/web/src/api/queries.ts b/web/src/api/queries.ts
index 69cf773..668f6f2 100644
--- a/web/src/api/queries.ts
+++ b/web/src/api/queries.ts
@@ -1,4 +1,4 @@
-import { useInfiniteQuery, useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { keepPreviousData, useInfiniteQuery, useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 
 import { api } from "./client";
 import type { components } from "./schema";
@@ -306,6 +306,7 @@ export function useSearch(q: string, visibility: string | null) {
 
       return data;
     },
+    placeholderData: keepPreviousData,
     getNextPageParam: (lastPage, allPages) => {
       const loaded = allPages.reduce((n, page) => n + page.hits.length, 0);
 
diff --git a/web/src/i18n/en.json b/web/src/i18n/en.json
index 9706f75..bafe24b 100644
--- a/web/src/i18n/en.json
+++ b/web/src/i18n/en.json
@@ -25,7 +25,8 @@
     "empty": "No results",
     "loadError": "Search is unavailable",
     "loadMore": "Load more",
-    "resultCount": "{{count}} results",
+    "resultCount_one": "{{count}} result",
+    "resultCount_other": "{{count}} results",
     "selectPrompt": "Select a result to see the full record"
   },
   "publish": {
diff --git a/web/src/i18n/sv.json b/web/src/i18n/sv.json
index 574c995..2477583 100644
--- a/web/src/i18n/sv.json
+++ b/web/src/i18n/sv.json
@@ -25,7 +25,8 @@
     "empty": "Inga träffar",
     "loadError": "Sök är inte tillgängligt",
     "loadMore": "Visa fler",
-    "resultCount": "{{count}} träffar",
+    "resultCount_one": "{{count}} träff",
+    "resultCount_other": "{{count}} träffar",
     "selectPrompt": "Välj en träff för att se hela posten"
   },
   "publish": {
diff --git a/web/src/search/search-panel.tsx b/web/src/search/search-panel.tsx
index e540b57..701e9b5 100644
--- a/web/src/search/search-panel.tsx
+++ b/web/src/search/search-panel.tsx
@@ -69,6 +69,7 @@ export function SearchPanel() {
               <button
                 key={value}
                 type="button"
+                aria-pressed={active}
                 onClick={() => setVisibility(value)}
                 className={`rounded px-2 py-0.5 ${active ? "bg-indigo-600 text-white" : "border"}`}
               >
diff --git a/web/src/search/search.test.tsx b/web/src/search/search.test.tsx
index 22a2f19..0edfb79 100644
--- a/web/src/search/search.test.tsx
+++ b/web/src/search/search.test.tsx
@@ -1,5 +1,5 @@
 import { expect, test } from "vitest";
-import { screen, waitFor } from "@testing-library/react";
+import { screen, waitFor, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { http, HttpResponse } from "msw";
 import { Route, Routes } from "react-router-dom";
@@ -75,3 +75,16 @@ test("clicking a result shows the object in the detail pane", async () => {
 
   expect(await screen.findByText(amphora.object_name)).toBeInTheDocument();
 });
+
+test("hydrates query and visibility from the initial URL", async () => {
+  renderApp(tree(), { route: "/search?q=bronze" });
+
+  expect(screen.getByLabelText(/search the collection/i)).toHaveValue("bronze");
+  expect(await screen.findByText("Bronze figurine")).toBeInTheDocument();
+
+  const { container } = renderApp(tree(), { route: "/search?q=bronze&visibility=internal" });
+
+  expect(
+    within(container).getByRole("button", { name: /^internal$/i }),
+  ).toHaveAttribute("aria-pressed", "true");
+});