From 4a319423702453cd27c3eab22dce22c8b44580e5 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 6 Jul 2026 09:40:39 +0000
Subject: [PATCH] Fix search page defects across documents, services, forms,
 favourites, and differentials

Review of every search surface found and fixed:

- app-modes: appModeHomeHref built malformed double-? URLs for
  prescribing/tools mode homes (e.g. /?mode=prescribing?focus=1), which
  dropped users into Answer mode; run=1 is now only emitted with a query
  on namespaced modes as well.
- Documents search: result filter OR-ed the query, type, and default-slug
  predicates so the query never filtered anything; now query AND type with
  an explicit no-results state. Result rows surface evidence matching the
  active type tab instead of always evidence[0] with a hardcoded table
  icon, documents without extracted evidence no longer borrow the
  clozapine fixture on search rows, reader evidence tab counts are derived
  from the document, and Open document links from evidence context keep
  the viewed evidence page/chunk. Evidence sidebar shows the document's
  own source path and updated date.
- Services: navigator no longer flashes "No matches" while the registry
  loads (skeleton + loading header band), the ATSI-specific chip now
  searches terms that exist in the catalogue, and the server wrapper
  normalizes an array-valued run param like it already did for q/query.
- Forms: empty state gains a working "try an example" action, result
  badge codes map to the form record instead of row position (so codes
  agree with the pathway panel), and the "Matched because" column reflects
  the actual query instead of a hardcoded "transport".
- Favourites: quick views clear a lingering (and hidden) set filter, the
  sort control is disabled in the Recently used view it cannot affect,
  the continue strip respects command scopes, and run-action saved
  searches are labelled "Saved search" instead of "Source".
- Differentials: generated snapshot loaders drop markdown-header preset
  artifacts ("# Scenario Presets" pill) and numeric field-weight entries
  that polluted search alias expansion with substring matches like "1.1".

Verified with npm run typecheck, lint, test (1097 passing), format:check,
and verify:cheap.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015rc3tTjs65D4gFBuCQhZGs
---
 src/app/services/page.tsx                     |   2 +-
 .../favourites-command-library-page.tsx       |  13 +-
 .../favourites-library-nav.tsx                |  15 +-
 .../forms/forms-search-results-page.tsx       |  48 ++-
 .../master-document-flow-mockups.tsx          | 319 +++++++++++-------
 .../services/services-navigator-page.tsx      |  30 +-
 src/lib/app-modes.ts                          |   5 +-
 src/lib/differentials.ts                      |  13 +-
 8 files changed, 301 insertions(+), 144 deletions(-)

diff --git a/src/app/services/page.tsx b/src/app/services/page.tsx
index bc4fbff80..f8a8883ca 100644
--- a/src/app/services/page.tsx
+++ b/src/app/services/page.tsx
@@ -16,7 +16,7 @@ export default async function ServicesIndexRoute({ searchParams }: { searchParam
     readFirstSearchParam(resolvedSearchParams.query) ??
     ""
   ).trim();
-  const hasSubmittedSearch = resolvedSearchParams.run === "1" && query.length > 0;
+  const hasSubmittedSearch = readFirstSearchParam(resolvedSearchParams.run) === "1" && query.length > 0;
 
   if (!hasSubmittedSearch) {
     return <ServicesHomePage />;
diff --git a/src/components/clinical-dashboard/favourites-command-library-page.tsx b/src/components/clinical-dashboard/favourites-command-library-page.tsx
index 98cfb3b0e..cb6593489 100644
--- a/src/components/clinical-dashboard/favourites-command-library-page.tsx
+++ b/src/components/clinical-dashboard/favourites-command-library-page.tsx
@@ -143,7 +143,10 @@ function isSourceBacked(item: FavouriteItem): boolean {
 }
 
 function toCommandItem(item: PrototypeFavouriteItem): FavouriteItem {
-  const type = typeByPrototypeType[item.type] ?? (item.primaryAction === "Run" ? "Saved search" : "Source");
+  const type =
+    item.type === "sources" && item.primaryAction === "Run"
+      ? "Saved search"
+      : (typeByPrototypeType[item.type] ?? "Source");
   return {
     id: item.id,
     title: item.title,
@@ -544,9 +547,11 @@ function FavouritesTable({
           <label className="relative block min-w-[9.5rem]">
             <span className="sr-only">Sort favourites</span>
             <select
-              value={sortMode}
+              value={viewMode === "recent" ? "last-used" : sortMode}
+              disabled={viewMode === "recent"}
+              title={viewMode === "recent" ? "Recently used view is always sorted by last used" : undefined}
               onChange={(event) => onSortModeChange(event.target.value as SortMode)}
-              className="h-9 w-full appearance-none rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] px-3 pr-9 text-xs font-bold text-[color:var(--text-muted)] outline-none hover:bg-[color:var(--surface-subtle)] focus:border-[color:var(--focus)] focus:ring-4 focus:ring-[color:var(--focus)]/20"
+              className="h-9 w-full appearance-none rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] px-3 pr-9 text-xs font-bold text-[color:var(--text-muted)] outline-none hover:bg-[color:var(--surface-subtle)] focus:border-[color:var(--focus)] focus:ring-4 focus:ring-[color:var(--focus)]/20 disabled:cursor-not-allowed disabled:opacity-60"
             >
               <option value="last-used">Sort: Last used</option>
               <option value="title">Sort: Title</option>
@@ -897,7 +902,7 @@ export function FavouritesCommandLibraryPage({ query = "" }: { query?: string })
 
   const continueItem = useMemo(() => getMostRecentlyUsedItem(items), [items]);
   const showContinueStrip =
-    continueItem !== null && filteredItems.some((item) => item.id === continueItem.id) && filteredItems.length > 0;
+    continueItem !== null && scopedItems.some((item) => item.id === continueItem.id) && scopedItems.length > 0;
 
   const selectedItem = selectedItemId ? (items.find((item) => item.id === selectedItemId) ?? null) : null;
 
diff --git a/src/components/clinical-dashboard/favourites-library-nav.tsx b/src/components/clinical-dashboard/favourites-library-nav.tsx
index dd0245683..ac516c2da 100644
--- a/src/components/clinical-dashboard/favourites-library-nav.tsx
+++ b/src/components/clinical-dashboard/favourites-library-nav.tsx
@@ -153,7 +153,10 @@ function buildSidebarSections({
           label: "Source-backed",
           count: sourceBackedCount,
           active: viewMode === "source-backed",
-          onClick: () => onSelectViewMode(viewMode === "source-backed" ? "all" : "source-backed"),
+          onClick: () => {
+            onSelectSet(null);
+            onSelectViewMode(viewMode === "source-backed" ? "all" : "source-backed");
+          },
         },
         {
           id: "pinned",
@@ -161,7 +164,10 @@ function buildSidebarSections({
           label: "Pinned",
           count: pinnedCount,
           active: viewMode === "pinned",
-          onClick: () => onSelectViewMode(viewMode === "pinned" ? "all" : "pinned"),
+          onClick: () => {
+            onSelectSet(null);
+            onSelectViewMode(viewMode === "pinned" ? "all" : "pinned");
+          },
         },
         {
           id: "recent",
@@ -169,7 +175,10 @@ function buildSidebarSections({
           label: "Recently used",
           count: items.length,
           active: viewMode === "recent",
-          onClick: () => onSelectViewMode(viewMode === "recent" ? "all" : "recent"),
+          onClick: () => {
+            onSelectSet(null);
+            onSelectViewMode(viewMode === "recent" ? "all" : "recent");
+          },
         },
       ],
     },
diff --git a/src/components/forms/forms-search-results-page.tsx b/src/components/forms/forms-search-results-page.tsx
index 2e941783a..c4bc6cc38 100644
--- a/src/components/forms/forms-search-results-page.tsx
+++ b/src/components/forms/forms-search-results-page.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import Link from "next/link";
+import { useRouter } from "next/navigation";
 import {
   ChevronRight,
   Clock3,
@@ -17,6 +18,7 @@ import {
 } from "lucide-react";
 import { useMemo } from "react";
 
+import { appModeHomeHref } from "@/lib/app-modes";
 import { rankFormRecords, type FormSearchMatch } from "@/lib/forms";
 import { useRegistryRecords, type RegistryRequestStatus } from "@/lib/use-registry-records";
 import {
@@ -38,13 +40,18 @@ type FormsSearchResultsPageProps = {
   query: string;
 };
 
-const resultCodes = ["4A", "4B", "3A", "5", "2B", "1A"];
+const formCodesBySlug: Record<string, string> = {
+  "transport-crisis-form": "4A",
+  "extension-transport-order": "4B",
+  "detention-examination-movement": "3A",
+  "transfer-order": "5",
+};
 const sourceSnippetCount = 278;
 const taskCount = 8;
 const pathwayCount = 12;
 
-function resultCode(index: number) {
-  return resultCodes[index] ?? String(index + 1);
+function resultCode(match: FormSearchMatch, index: number) {
+  return formCodesBySlug[match.service.slug] ?? String(index + 1);
 }
 
 function tagToneClass(label: string) {
@@ -61,10 +68,13 @@ function tagToneClass(label: string) {
   return "bg-[color:var(--clinical-accent-soft)] text-[color:var(--clinical-accent)]";
 }
 
-function compactMatchReason(match: FormSearchMatch) {
-  if (match.reasons.includes("title")) return `Title or content match for "transport"`;
+function compactMatchReason(match: FormSearchMatch, query: string) {
+  const trimmedQuery = query.trim();
+  if (match.reasons.includes("title")) {
+    return trimmedQuery ? `Title or content match for "${trimmedQuery}"` : "Title or content match";
+  }
   if (match.reasons.includes("record fields")) return "Content match in related pathway";
-  return "Content match for transfer/transport";
+  return "Content match in the forms catalogue";
 }
 
 function ResultTabs({ formsCount }: { formsCount: number }) {
@@ -106,7 +116,7 @@ function ResultTabs({ formsCount }: { formsCount: number }) {
   );
 }
 
-function ResultsTable({ matches }: { matches: FormSearchMatch[] }) {
+function ResultsTable({ matches, query }: { matches: FormSearchMatch[]; query: string }) {
   return (
     <section
       data-testid="form-search-results"
@@ -133,7 +143,7 @@ function ResultsTable({ matches }: { matches: FormSearchMatch[] }) {
               className="grid gap-4 border-b border-[color:var(--border)] px-5 py-4 transition last:border-b-0 hover:bg-[color:var(--surface-subtle)]/55 md:grid-cols-[86px_minmax(180px,1fr)_170px_minmax(180px,1fr)_86px] md:items-center"
             >
               <div className="grid h-12 w-14 place-items-center rounded-lg border border-[color:var(--clinical-accent-border)] bg-[color:var(--clinical-accent-soft)] text-3xl font-extrabold text-[color:var(--clinical-accent)]">
-                {resultCode(index)}
+                {resultCode(match, index)}
               </div>
               <div>
                 <h3 className="max-w-[21rem] text-sm font-extrabold leading-snug text-[color:var(--text-heading)]">
@@ -157,7 +167,7 @@ function ResultsTable({ matches }: { matches: FormSearchMatch[] }) {
                 })}
               </div>
               <p className="text-sm font-medium leading-relaxed text-[color:var(--text-muted)]">
-                {compactMatchReason(match)}
+                {compactMatchReason(match, query)}
               </p>
               <Link
                 href={`/forms/${form.slug}`}
@@ -403,7 +413,7 @@ function VerifiedFooter() {
   );
 }
 
-function MobileCards({ matches }: { matches: FormSearchMatch[] }) {
+function MobileCards({ matches, query }: { matches: FormSearchMatch[]; query: string }) {
   return (
     <section
       data-testid="form-search-mobile-results"
@@ -420,7 +430,7 @@ function MobileCards({ matches }: { matches: FormSearchMatch[] }) {
               className="grid grid-cols-[38px_minmax(0,1fr)] gap-1.5 rounded-lg border border-[color:var(--border)] bg-[color:var(--surface)] p-1 shadow-[0_1px_2px_rgb(12_24_34_/_5%)]"
             >
               <div className="grid h-9 w-9 place-items-center rounded-lg border border-[color:var(--clinical-accent-border)] bg-[color:var(--clinical-accent-soft)] text-lg font-extrabold leading-none text-[color:var(--clinical-accent)]">
-                {resultCode(index)}
+                {resultCode(match, index)}
               </div>
               <div className="min-w-0">
                 <div className="flex min-w-0 items-start justify-between gap-2">
@@ -456,7 +466,7 @@ function MobileCards({ matches }: { matches: FormSearchMatch[] }) {
                   })}
                 </div>
                 <p className="mt-0.5 truncate text-3xs font-medium leading-3 text-[color:var(--text-muted)]">
-                  {compactMatchReason(match)}
+                  {compactMatchReason(match, query)}
                 </p>
               </div>
             </article>
@@ -580,6 +590,7 @@ export function FormsSearchResultsPage(props: FormsSearchResultsPageProps) {
 }
 
 function FormsSearchResultsPageContent({ query }: FormsSearchResultsPageProps) {
+  const router = useRouter();
   const command = useSearchCommand();
   const registry = useRegistryRecords("form");
   const registryReady = registry.status === "ready";
@@ -604,17 +615,24 @@ function FormsSearchResultsPageContent({ query }: FormsSearchResultsPageProps) {
                 <SearchResultsHeaderBand modeId="forms" query={query} matchCount={scopedMatches.length} />
               </div>
               {query.trim() && scopedMatches.length === 0 ? (
-                <SearchResultsEmptyState modeId="forms" query={query} onClearScopes={command?.onClearScopes} />
+                <SearchResultsEmptyState
+                  modeId="forms"
+                  query={query}
+                  onClearScopes={command?.onClearScopes}
+                  onTryExample={(example) =>
+                    router.push(appModeHomeHref("forms", { query: example, focus: true, run: true }))
+                  }
+                />
               ) : (
                 <>
                   <div className="overflow-x-auto">
                     <ResultTabs formsCount={scopedMatches.length} />
                   </div>
                   <div className="hidden lg:block">
-                    <ResultsTable matches={scopedMatches} />
+                    <ResultsTable matches={scopedMatches} query={query} />
                   </div>
                   <div className="lg:hidden">
-                    <MobileCards matches={scopedMatches} />
+                    <MobileCards matches={scopedMatches} query={query} />
                   </div>
                 </>
               )}
diff --git a/src/components/master-document-flow-mockups.tsx b/src/components/master-document-flow-mockups.tsx
index c0d03eb42..ec52855cf 100644
--- a/src/components/master-document-flow-mockups.tsx
+++ b/src/components/master-document-flow-mockups.tsx
@@ -250,12 +250,12 @@ const monitoringTableRows = [
   ["> 1 year", "4 weekly", "Full Blood Count (ANC)", "ANC < 1.0 x10^9/L"],
 ] as const;
 
-function documentHref(document: DocumentFixture, query = defaultQuery) {
+function documentHref(document: DocumentFixture, query = defaultQuery, evidence?: EvidenceFixture) {
   return documentReaderHref({
     document: document.slug,
     query,
-    page: String(document.page),
-    chunk: document.chunk,
+    page: String(evidence?.page ?? document.page),
+    chunk: evidence?.id ?? document.chunk,
   });
 }
 
@@ -285,12 +285,26 @@ function primaryEvidence(document: DocumentFixture) {
   return document.evidence[0] ?? defaultDocument.evidence[0];
 }
 
-function primaryEvidenceLabel(document: DocumentFixture) {
-  const evidence = primaryEvidence(document);
-  if (evidence.type === "table") return evidence.label;
+function evidenceForType(document: DocumentFixture, type: "all" | EvidenceType) {
+  if (type !== "all") return document.evidence.find((evidence) => evidence.type === type);
+  return document.evidence[0];
+}
+
+function evidenceLabel(evidence: EvidenceFixture) {
   if (evidence.type === "quote") return "Quote";
-  if (evidence.type === "image") return evidence.label;
-  return "Related";
+  if (evidence.type === "related") return "Related";
+  return evidence.label;
+}
+
+function evidenceCountLabel(document: DocumentFixture, type: EvidenceType, label: string) {
+  return `${label} ${document.evidence.filter((evidence) => evidence.type === type).length}`;
+}
+
+function evidenceTypeIconFor(type: EvidenceType): LucideIcon {
+  if (type === "table") return Table2;
+  if (type === "quote") return Quote;
+  if (type === "image") return FileImage;
+  return Layers3;
 }
 
 function evidenceTypeLabel(type: EvidenceType) {
@@ -439,12 +453,14 @@ function SearchResultMobileCard({
   document,
   query,
   selected,
+  activeType = "all",
 }: {
   document: DocumentFixture;
   query: string;
   selected: boolean;
+  activeType?: "all" | EvidenceType;
 }) {
-  const evidence = primaryEvidence(document);
+  const evidence = evidenceForType(document, activeType);
   return (
     <article
       className={cn(
@@ -457,12 +473,25 @@ function SearchResultMobileCard({
       <div className="flex items-start justify-between gap-3">
         <div className="min-w-0">
           <div className="flex min-w-0 items-center gap-1.5 text-sm font-extrabold text-[color:var(--clinical-accent)]">
-            <EvidenceTypeIcon type={evidence.type} className="h-4 w-4 shrink-0" />
-            <span className="truncate">{evidenceTypeLabel(evidence.type)}</span>
-            <span className="text-[color:var(--text-soft)]">·</span>
-            <span className="shrink-0">p.{evidence.page}</span>
-            <span className="text-[color:var(--text-soft)]">·</span>
-            <span className="shrink-0">{evidence.relevance}%</span>
+            {evidence ? (
+              <>
+                <EvidenceTypeIcon type={evidence.type} className="h-4 w-4 shrink-0" />
+                <span className="truncate">{evidenceTypeLabel(evidence.type)}</span>
+                <span className="text-[color:var(--text-soft)]">·</span>
+                <span className="shrink-0">p.{evidence.page}</span>
+                <span className="text-[color:var(--text-soft)]">·</span>
+                <span className="shrink-0">{evidence.relevance}%</span>
+              </>
+            ) : (
+              <>
+                <FileText className="h-4 w-4 shrink-0" aria-hidden="true" />
+                <span className="truncate">Document match</span>
+                <span className="text-[color:var(--text-soft)]">·</span>
+                <span className="shrink-0">p.{document.page}</span>
+                <span className="text-[color:var(--text-soft)]">·</span>
+                <span className="shrink-0">{document.relevance}%</span>
+              </>
+            )}
           </div>
         </div>
         {selected ? <Pill active>Best match</Pill> : <IconButton label="More result actions" icon={MoreVertical} />}
@@ -484,38 +513,45 @@ function SearchResultMobileCard({
           <p className="mt-1 line-clamp-1 text-xs font-semibold text-[color:var(--text-muted)]">
             {document.kind} · {document.version}
           </p>
-          <h2 className="mt-2 line-clamp-1 text-sm font-extrabold text-[color:var(--clinical-accent)]">
-            {evidence.title}
-          </h2>
+          {evidence ? (
+            <h2 className="mt-2 line-clamp-1 text-sm font-extrabold text-[color:var(--clinical-accent)]">
+              {evidence.title}
+            </h2>
+          ) : null}
         </div>
       </div>
-      <p className="mt-3 line-clamp-2 text-sm font-medium leading-6 text-[color:var(--text-muted)]">{evidence.body}</p>
+      <p className="mt-3 line-clamp-2 text-sm font-medium leading-6 text-[color:var(--text-muted)]">
+        {evidence ? evidence.body : document.snippet}
+      </p>
       <div className="mt-3 flex flex-wrap items-center gap-1.5">
         <Pill tone={document.status === "Current" ? "green" : "amber"} icon={CheckCircle2}>
           {document.status}
         </Pill>
-        <Pill>{primaryEvidenceLabel(document)}</Pill>
+        <Pill>{evidence ? evidenceLabel(evidence) : "No extracted evidence"}</Pill>
       </div>
       <div className="mt-3 grid min-w-0 grid-cols-2 gap-2">
         <Link
-          href={documentHref(document, query)}
+          href={documentHref(document, query, evidence)}
           className={cn(
             "inline-flex min-h-11 min-w-0 items-center justify-center gap-2 rounded-lg bg-[color:var(--command)] px-3 text-sm font-bold text-[color:var(--command-contrast)]",
             focusRing,
+            !evidence && "col-span-2",
           )}
         >
           Open document
           <ExternalLink className="h-4 w-4" aria-hidden="true" />
         </Link>
-        <Link
-          href={evidenceHref(document, evidence, query)}
-          className={cn(
-            "inline-flex min-h-11 min-w-0 items-center justify-center rounded-lg border border-[color:var(--clinical-accent-border)] bg-[color:var(--clinical-accent-soft)] px-3 text-sm font-bold text-[color:var(--clinical-accent)]",
-            focusRing,
-          )}
-        >
-          Open evidence
-        </Link>
+        {evidence ? (
+          <Link
+            href={evidenceHref(document, evidence, query)}
+            className={cn(
+              "inline-flex min-h-11 min-w-0 items-center justify-center rounded-lg border border-[color:var(--clinical-accent-border)] bg-[color:var(--clinical-accent-soft)] px-3 text-sm font-bold text-[color:var(--clinical-accent)]",
+              focusRing,
+            )}
+          >
+            Open evidence
+          </Link>
+        ) : null}
       </div>
     </article>
   );
@@ -606,7 +642,7 @@ export function MasterDocumentSearch() {
         document.snippet.toLowerCase().includes(lowered) ||
         document.terms.some((term) => lowered.includes(term.toLowerCase()) || term.toLowerCase().includes(lowered));
       const matchesType = type === "all" || document.evidence.some((item) => item.type === type);
-      return matchesQuery || matchesType || document.slug === defaultDocument.slug;
+      return matchesQuery && matchesType;
     });
   }, [query, type]);
 
@@ -730,87 +766,144 @@ export function MasterDocumentSearch() {
               <span>Actions</span>
             </div>
             <div className="overflow-x-auto">
-              {filtered.map((document, index) => (
-                <article
-                  key={document.slug}
-                  className={cn(
-                    "grid min-w-[58rem] grid-cols-[minmax(20rem,1.7fr)_minmax(17rem,1.25fr)_9rem_8rem_5rem] items-center gap-3 border-b border-[color:var(--border)] px-4 py-3",
-                    index === 0 &&
-                      "bg-[color:var(--clinical-accent-soft)]/30 shadow-[inset_3px_0_0_var(--clinical-accent)]",
-                  )}
-                >
-                  <div className="grid min-w-0 grid-cols-[auto_minmax(0,1fr)] gap-3">
-                    <FileTile />
+              {filtered.length === 0 ? (
+                <div className="px-4 py-10 text-center">
+                  <p className="text-base font-extrabold text-[color:var(--text-heading)]">
+                    No documents match &ldquo;{query}&rdquo;
+                  </p>
+                  <p className="mt-1 text-sm font-medium text-[color:var(--text-muted)]">
+                    Try a broader search term{type !== "all" ? " or reset the evidence filter" : ""}.
+                  </p>
+                  {type !== "all" ? (
+                    <button
+                      type="button"
+                      onClick={() => setType("all")}
+                      className={cn(
+                        "mt-4 inline-flex min-h-10 items-center gap-2 rounded-lg border border-[color:var(--clinical-accent-border)] bg-[color:var(--clinical-accent-soft)] px-4 text-sm font-bold text-[color:var(--clinical-accent)]",
+                        focusRing,
+                      )}
+                    >
+                      Show all sources
+                    </button>
+                  ) : null}
+                </div>
+              ) : null}
+              {filtered.map((document, index) => {
+                const rowEvidence = evidenceForType(document, type);
+                return (
+                  <article
+                    key={document.slug}
+                    className={cn(
+                      "grid min-w-[58rem] grid-cols-[minmax(20rem,1.7fr)_minmax(17rem,1.25fr)_9rem_8rem_5rem] items-center gap-3 border-b border-[color:var(--border)] px-4 py-3",
+                      index === 0 &&
+                        "bg-[color:var(--clinical-accent-soft)]/30 shadow-[inset_3px_0_0_var(--clinical-accent)]",
+                    )}
+                  >
+                    <div className="grid min-w-0 grid-cols-[auto_minmax(0,1fr)] gap-3">
+                      <FileTile />
+                      <div className="min-w-0">
+                        <div className="flex flex-wrap gap-1.5">
+                          {index === 0 ? <Pill active>Best match</Pill> : <Pill>Relevant</Pill>}
+                        </div>
+                        <Link
+                          href={documentHref(document, query, rowEvidence)}
+                          className={cn(
+                            "mt-1 block line-clamp-2 text-sm font-extrabold leading-5 text-[color:var(--text-heading)] hover:text-[color:var(--clinical-accent)]",
+                            focusRing,
+                          )}
+                        >
+                          {document.title}
+                        </Link>
+                        <p className="mt-1 truncate text-xs font-semibold text-[color:var(--text-muted)]">
+                          {document.kind} · {document.version} · {document.source}
+                        </p>
+                      </div>
+                    </div>
                     <div className="min-w-0">
                       <div className="flex flex-wrap gap-1.5">
-                        {index === 0 ? <Pill active>Best match</Pill> : <Pill>Relevant</Pill>}
+                        {rowEvidence ? (
+                          <Pill icon={evidenceTypeIconFor(rowEvidence.type)}>{evidenceLabel(rowEvidence)}</Pill>
+                        ) : (
+                          <Pill>No extracted evidence</Pill>
+                        )}
+                        <Pill>p.{rowEvidence?.page ?? document.page}</Pill>
+                        <Pill>{document.chunk}</Pill>
+                      </div>
+                      <p className="mt-1 truncate text-xs font-medium text-[color:var(--text-muted)]">
+                        {rowEvidence ? rowEvidence.body : document.snippet}
+                      </p>
+                    </div>
+                    <div className="space-y-1">
+                      <Pill tone={document.status === "Current" ? "green" : "amber"}>{document.status}</Pill>
+                      <p className="text-xs font-semibold text-[color:var(--text-muted)]">{document.review}</p>
+                      <p className="text-xs font-semibold text-[color:var(--text-soft)]">{document.updated}</p>
+                    </div>
+                    <div>
+                      <p className="nums text-sm font-extrabold text-[color:var(--clinical-accent)]">
+                        {document.relevance}%
+                      </p>
+                      <div className="mt-2 h-1.5 rounded-full bg-[color:var(--border)]">
+                        <div
+                          className="h-full rounded-full bg-[color:var(--clinical-accent)]"
+                          style={{ width: `${document.relevance}%` }}
+                        />
                       </div>
+                    </div>
+                    <div className="flex items-center gap-1">
                       <Link
-                        href={documentHref(document, query)}
+                        href={documentHref(document, query, rowEvidence)}
                         className={cn(
-                          "mt-1 block line-clamp-2 text-sm font-extrabold leading-5 text-[color:var(--text-heading)] hover:text-[color:var(--clinical-accent)]",
+                          "grid h-9 w-9 place-items-center rounded-lg border border-[color:var(--border-lux)] bg-[color:var(--surface)] text-[color:var(--text-heading)]",
                           focusRing,
                         )}
+                        aria-label={`Open ${document.title}`}
                       >
-                        {document.title}
+                        <ExternalLink className="h-4 w-4" />
                       </Link>
-                      <p className="mt-1 truncate text-xs font-semibold text-[color:var(--text-muted)]">
-                        {document.kind} · {document.version} · {document.source}
-                      </p>
-                    </div>
-                  </div>
-                  <div className="min-w-0">
-                    <div className="flex flex-wrap gap-1.5">
-                      <Pill icon={Table2}>{primaryEvidenceLabel(document)}</Pill>
-                      <Pill>p.{document.page}</Pill>
-                      <Pill>{document.chunk}</Pill>
-                    </div>
-                    <p className="mt-1 truncate text-xs font-medium text-[color:var(--text-muted)]">
-                      {document.snippet}
-                    </p>
-                  </div>
-                  <div className="space-y-1">
-                    <Pill tone={document.status === "Current" ? "green" : "amber"}>{document.status}</Pill>
-                    <p className="text-xs font-semibold text-[color:var(--text-muted)]">{document.review}</p>
-                    <p className="text-xs font-semibold text-[color:var(--text-soft)]">{document.updated}</p>
-                  </div>
-                  <div>
-                    <p className="nums text-sm font-extrabold text-[color:var(--clinical-accent)]">
-                      {document.relevance}%
-                    </p>
-                    <div className="mt-2 h-1.5 rounded-full bg-[color:var(--border)]">
-                      <div
-                        className="h-full rounded-full bg-[color:var(--clinical-accent)]"
-                        style={{ width: `${document.relevance}%` }}
-                      />
+                      <button
+                        type="button"
+                        className="grid h-9 w-9 place-items-center rounded-lg text-[color:var(--text-muted)]"
+                      >
+                        <MoreVertical className="h-4 w-4" />
+                      </button>
                     </div>
-                  </div>
-                  <div className="flex items-center gap-1">
-                    <Link
-                      href={documentHref(document, query)}
-                      className={cn(
-                        "grid h-9 w-9 place-items-center rounded-lg border border-[color:var(--border-lux)] bg-[color:var(--surface)] text-[color:var(--text-heading)]",
-                        focusRing,
-                      )}
-                      aria-label={`Open ${document.title}`}
-                    >
-                      <ExternalLink className="h-4 w-4" />
-                    </Link>
-                    <button
-                      type="button"
-                      className="grid h-9 w-9 place-items-center rounded-lg text-[color:var(--text-muted)]"
-                    >
-                      <MoreVertical className="h-4 w-4" />
-                    </button>
-                  </div>
-                </article>
-              ))}
+                  </article>
+                );
+              })}
             </div>
           </section>
 
           <section className="mt-4 grid gap-3 md:hidden" aria-label="Document results">
+            {filtered.length === 0 ? (
+              <div className="rounded-lg border border-[color:var(--border-lux)] bg-[color:var(--surface)] px-4 py-8 text-center shadow-[var(--shadow-inset)]">
+                <p className="text-base font-extrabold text-[color:var(--text-heading)]">
+                  No documents match &ldquo;{query}&rdquo;
+                </p>
+                <p className="mt-1 text-sm font-medium text-[color:var(--text-muted)]">
+                  Try a broader search term{type !== "all" ? " or reset the evidence filter" : ""}.
+                </p>
+                {type !== "all" ? (
+                  <button
+                    type="button"
+                    onClick={() => setType("all")}
+                    className={cn(
+                      "mt-4 inline-flex min-h-10 items-center gap-2 rounded-lg border border-[color:var(--clinical-accent-border)] bg-[color:var(--clinical-accent-soft)] px-4 text-sm font-bold text-[color:var(--clinical-accent)]",
+                      focusRing,
+                    )}
+                  >
+                    Show all sources
+                  </button>
+                ) : null}
+              </div>
+            ) : null}
             {filtered.map((document, index) => (
-              <SearchResultMobileCard key={document.slug} document={document} query={query} selected={index === 0} />
+              <SearchResultMobileCard
+                key={document.slug}
+                document={document}
+                query={query}
+                selected={index === 0}
+                activeType={type}
+              />
             ))}
           </section>
         </div>
@@ -1175,10 +1268,10 @@ export function MasterDocumentReader() {
                 <div className="flex gap-1 overflow-x-auto pb-1">
                   {[
                     ["all", `All ${document.evidence.length}`],
-                    ["table", "Tables 1"],
-                    ["quote", "Quotes 1"],
-                    ["image", "Images 1"],
-                    ["related", "Related 1"],
+                    ["table", evidenceCountLabel(document, "table", "Tables")],
+                    ["quote", evidenceCountLabel(document, "quote", "Quotes")],
+                    ["image", evidenceCountLabel(document, "image", "Images")],
+                    ["related", evidenceCountLabel(document, "related", "Related")],
                   ].map(([key, label]) => (
                     <button
                       key={key}
@@ -1292,9 +1385,9 @@ export function MasterDocumentReader() {
               <div className="mt-3 flex gap-1 overflow-x-auto pb-1">
                 {[
                   ["all", `All ${document.evidence.length}`],
-                  ["table", "Tables 1"],
-                  ["quote", "Quotes 1"],
-                  ["image", "Images 1"],
+                  ["table", evidenceCountLabel(document, "table", "Tables")],
+                  ["quote", evidenceCountLabel(document, "quote", "Quotes")],
+                  ["image", evidenceCountLabel(document, "image", "Images")],
                 ].map(([key, label]) => (
                   <button
                     key={key}
@@ -1436,14 +1529,14 @@ export function MasterEvidenceDetail() {
         <header className="sticky top-0 z-30 border-b border-[color:var(--border)] bg-[color:var(--surface)] px-4 py-3">
           <div className="flex min-h-11 items-center gap-3">
             <Link
-              href={documentHref(document, query)}
+              href={documentHref(document, query, evidence)}
               className={cn("grid h-11 w-11 place-items-center rounded-lg text-[color:var(--text-heading)]", focusRing)}
               aria-label="Back to document"
             >
               <ArrowLeft className="h-6 w-6" aria-hidden="true" />
             </Link>
             <h1 className="text-2xl font-extrabold text-[color:var(--text-heading)]">Evidence</h1>
-            <Pill icon={Table2}>
+            <Pill icon={evidenceTypeIconFor(evidence.type)}>
               {evidence.label} · p.{evidence.page}
             </Pill>
             <div className="ml-auto">
@@ -1458,7 +1551,7 @@ export function MasterEvidenceDetail() {
             <nav className="flex flex-wrap items-center gap-2 text-sm font-semibold text-[color:var(--text-muted)]">
               <Link href={searchHref(query)}>Documents</Link>
               <ChevronRight className="h-4 w-4" />
-              <Link href={documentHref(document, query)}>{document.shortTitle}</Link>
+              <Link href={documentHref(document, query, evidence)}>{document.shortTitle}</Link>
               <ChevronRight className="h-4 w-4" />
               <span className="text-[color:var(--text-heading)]">{evidence.label}</span>
             </nav>
@@ -1470,7 +1563,7 @@ export function MasterEvidenceDetail() {
             </div>
           </div>
           <Link
-            href={documentHref(document, query)}
+            href={documentHref(document, query, evidence)}
             className={cn(
               "inline-flex min-h-10 items-center gap-2 rounded-lg border border-[color:var(--border-lux)] bg-[color:var(--surface-raised)] px-3 text-sm font-bold text-[color:var(--text-heading)]",
               focusRing,
@@ -1557,7 +1650,7 @@ export function MasterEvidenceDetail() {
                 <div className="flex flex-wrap items-center justify-between gap-3">
                   <h3 className="text-sm font-extrabold text-[color:var(--text-heading)]">Source page</h3>
                   <Link
-                    href={documentHref(document, query)}
+                    href={documentHref(document, query, evidence)}
                     className={cn(
                       "inline-flex min-h-9 items-center gap-2 text-sm font-bold text-[color:var(--clinical-accent)]",
                       focusRing,
@@ -1639,10 +1732,10 @@ export function MasterEvidenceDetail() {
                     {document.title}
                   </h2>
                   <p className="mt-1 text-xs font-semibold text-[color:var(--text-muted)]">
-                    {document.version} · Published 12 May 2024
+                    {document.version} · Updated {document.updated}
                   </p>
                   <Link
-                    href={documentHref(document, query)}
+                    href={documentHref(document, query, evidence)}
                     className="mt-2 inline-flex items-center gap-2 text-sm font-bold text-[color:var(--clinical-accent)]"
                   >
                     Open full document
@@ -1657,7 +1750,7 @@ export function MasterEvidenceDetail() {
                 ["Section", `Section ${evidence.section}`],
                 ["Chunk ID", evidence.chunk],
                 ["Indexed", "24 May 2024 · 10:21 AEST"],
-                ["Source", "clinical-documents/clozapine-guidelines-v3.2.pdf"],
+                ["Source", document.pdfPath.replace(/^\//, "")],
               ].map(([label, value]) => (
                 <div key={label} className="grid grid-cols-[6rem_minmax(0,1fr)] gap-3 text-sm">
                   <span className="font-bold text-[color:var(--text-muted)]">{label}</span>
@@ -1691,7 +1784,7 @@ export function MasterEvidenceDetail() {
               <Pill tone="green">Current</Pill>
               <div className="grid gap-2">
                 <Link
-                  href={documentHref(document, query)}
+                  href={documentHref(document, query, evidence)}
                   className={cn(
                     "inline-flex min-h-11 items-center justify-center gap-2 rounded-lg bg-[color:var(--command)] px-3 text-sm font-bold text-[color:var(--command-contrast)]",
                     focusRing,
diff --git a/src/components/services/services-navigator-page.tsx b/src/components/services/services-navigator-page.tsx
index d07f9b17f..f03e6793c 100644
--- a/src/components/services/services-navigator-page.tsx
+++ b/src/components/services/services-navigator-page.tsx
@@ -26,6 +26,7 @@ import { SearchResultsLayout } from "@/components/clinical-dashboard/search-resu
 import {
   SearchResultsEmptyState,
   SearchResultsHeaderBand,
+  SearchResultsSkeleton,
 } from "@/components/clinical-dashboard/search-results-header-band";
 import { useSearchCommand } from "@/components/clinical-dashboard/search-command-context";
 import { appModeHomeHref } from "@/lib/app-modes";
@@ -435,6 +436,7 @@ export function ServicesNavigatorPage() {
   const [localQuery, setLocalQuery] = useState(() => ({ urlQuery, value: initialQuery }));
   const query = localQuery.urlQuery === urlQuery ? localQuery.value : initialQuery;
   const registry = useRegistryRecords("service");
+  const registryLoading = registry.status === "loading";
   const searchableRecords = useMemo(
     () => (registry.status === "ready" ? registry.records : registry.status === "loading" ? [] : serviceRecords),
     [registry.records, registry.status],
@@ -478,10 +480,20 @@ export function ServicesNavigatorPage() {
           />
           <Stepper />
           <div className="xl:hidden">
-            <SearchResultsHeaderBand modeId="services" query={query} matchCount={scopedMatches.length} />
+            <SearchResultsHeaderBand
+              modeId="services"
+              query={query}
+              matchCount={scopedMatches.length}
+              loading={registryLoading}
+            />
           </div>
           <div className="hidden xl:block">
-            <SearchResultsHeaderBand modeId="services" query={query} matchCount={scopedMatches.length} />
+            <SearchResultsHeaderBand
+              modeId="services"
+              query={query}
+              matchCount={scopedMatches.length}
+              loading={registryLoading}
+            />
           </div>
         </>
       }
@@ -494,7 +506,9 @@ export function ServicesNavigatorPage() {
         />
       }
     >
-      {query.trim() && scopedMatches.length === 0 ? (
+      {registryLoading ? (
+        <SearchResultsSkeleton />
+      ) : query.trim() && scopedMatches.length === 0 ? (
         <SearchResultsEmptyState
           modeId="services"
           query={query}
@@ -547,7 +561,15 @@ export function ServicesNavigatorPage() {
                   <button
                     key={chip}
                     type="button"
-                    onClick={() => applyServiceQuery(index === 0 ? defaultQuery : chip)}
+                    onClick={() =>
+                      applyServiceQuery(
+                        index === 0
+                          ? defaultQuery
+                          : chip === "ATSI-specific"
+                            ? "Aboriginal Torres Strait Islander"
+                            : chip,
+                      )
+                    }
                     className={cn(
                       "min-h-8 rounded-full border px-3 text-xs font-bold transition hover:-translate-y-px hover:shadow-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[color:var(--focus)]",
                       index > 2 ? "max-sm:hidden" : "",
diff --git a/src/lib/app-modes.ts b/src/lib/app-modes.ts
index 055f04a98..d5581f19c 100644
--- a/src/lib/app-modes.ts
+++ b/src/lib/app-modes.ts
@@ -250,7 +250,7 @@ export function appModeHomeHref(modeId: AppModeId, options: { query?: string; fo
     const namespacedParams = new URLSearchParams();
     if (query) namespacedParams.set("q", query);
     if (options.focus) namespacedParams.set("focus", "1");
-    if (options.run) namespacedParams.set("run", "1");
+    if (options.run && query) namespacedParams.set("run", "1");
 
     const suffix = namespacedParams.toString();
     return suffix ? `${mode.href}?${suffix}` : mode.href;
@@ -260,7 +260,8 @@ export function appModeHomeHref(modeId: AppModeId, options: { query?: string; fo
     const homeParams = new URLSearchParams();
     if (options.focus) homeParams.set("focus", "1");
     const suffix = homeParams.toString();
-    return suffix ? `${mode.href}?${suffix}` : mode.href;
+    const separator = mode.href.includes("?") ? "&" : "?";
+    return suffix ? `${mode.href}${separator}${suffix}` : mode.href;
   }
 
   const params = new URLSearchParams({ mode: modeId });
diff --git a/src/lib/differentials.ts b/src/lib/differentials.ts
index 497df7699..bd87a79e7 100644
--- a/src/lib/differentials.ts
+++ b/src/lib/differentials.ts
@@ -46,7 +46,9 @@ export function differentialPresentations(): DifferentialPresentationWorkflow[]
 }
 
 export function differentialScenarioPresets(): DifferentialScenarioPreset[] {
-  return catalog().presets;
+  // The generated snapshot can carry markdown-header artifacts (e.g. "# Scenario
+  // Presets") as synthetic first rows; they are not searchable presets.
+  return catalog().presets.filter((preset) => !preset.query.trimStart().startsWith("#"));
 }
 
 export function differentialRedFlagFlows(): DifferentialRedFlagFlow[] {
@@ -54,7 +56,14 @@ export function differentialRedFlagFlows(): DifferentialRedFlagFlow[] {
 }
 
 export function differentialSearchAliases(): Record<string, string[]> {
-  return catalog().searchAliases;
+  // The generated snapshot can leak template metadata (field name → numeric
+  // weight, e.g. "tags" → ["1.1"]) into the alias map; bare-number aliases
+  // would match unrelated records by substring, so drop them.
+  return Object.fromEntries(
+    Object.entries(catalog().searchAliases)
+      .map(([token, aliases]) => [token, aliases.filter((alias) => !/^\d+(\.\d+)?$/.test(alias.trim()))] as const)
+      .filter(([, aliases]) => aliases.length > 0),
+  );
 }
 
 export function getPresentationWorkflow(slug: string | null | undefined) {