diff --git a/website/src/components/brand/CookbookRecipe.tsx b/website/src/components/brand/CookbookRecipe.tsx
index 315ac386..faaecde9 100644
--- a/website/src/components/brand/CookbookRecipe.tsx
+++ b/website/src/components/brand/CookbookRecipe.tsx
@@ -368,7 +368,7 @@ function RecipeFileView({
   if (status === "error" || text === undefined) {
     return (
       <Text as="p" size="200" variant="muted">
-        Couldn&apos;t load this file. <a href={githubUrl}>View it on GitHub</a>.
+        Couldn't load this file. <a href={githubUrl}>View it on GitHub</a>.
       </Text>
     );
   }
diff --git a/website/src/components/brand/DetailChassis.tsx b/website/src/components/brand/DetailChassis.tsx
index 42b71296..9040d7c8 100644
--- a/website/src/components/brand/DetailChassis.tsx
+++ b/website/src/components/brand/DetailChassis.tsx
@@ -402,11 +402,20 @@ export function buildDetailToc(markdownHtml: string): {
     (match, attrs: string, inner: string) => {
       const label = inner
         .replace(/<[^>]+>/g, "")
-        .replace(/&amp;/g, "&")
-        .replace(/&lt;/g, "<")
-        .replace(/&gt;/g, ">")
-        .replace(/&quot;/g, '"')
-        .replace(/&#39;/g, "'")
+        .replace(/&lt;|&gt;|&quot;|&#39;|&amp;/g, (entity) => {
+          switch (entity) {
+            case "&lt;":
+              return "<";
+            case "&gt;":
+              return ">";
+            case "&quot;":
+              return '"';
+            case "&#39;":
+              return "'";
+            default:
+              return "&";
+          }
+        })
         .trim();
       if (!label) return match;
 
diff --git a/website/src/components/brand/SkillDetail.tsx b/website/src/components/brand/SkillDetail.tsx
index 54b8afb7..07a61e57 100644
--- a/website/src/components/brand/SkillDetail.tsx
+++ b/website/src/components/brand/SkillDetail.tsx
@@ -480,7 +480,7 @@ function FileView({
   if (status === "error" || text === undefined) {
     return (
       <Text as="p" size="200" variant="muted">
-        Couldn&apos;t load this file. <a href={githubUrl}>View it on GitHub</a>.
+        Couldn't load this file. <a href={githubUrl}>View it on GitHub</a>.
       </Text>
     );
   }
diff --git a/website/src/components/brand/SyntaxHighlightedCode.tsx b/website/src/components/brand/SyntaxHighlightedCode.tsx
index 78d4a8f0..bc926cbd 100644
--- a/website/src/components/brand/SyntaxHighlightedCode.tsx
+++ b/website/src/components/brand/SyntaxHighlightedCode.tsx
@@ -52,7 +52,7 @@ const rules: Record<CodeLanguage, readonly TokenRule[]> = {
     { kind: "punctuation", expression: /[{}[\],:]/y },
   ],
   markup: [
-    { kind: "comment", expression: /<!--.*?-->/y },
+    { kind: "comment", expression: /<!--[\s\S]*?-->/y },
     { kind: "tag", expression: /<\/?[A-Za-z][\w:-]*/y },
     { kind: "attr-name", expression: /[A-Za-z_:][\w:.-]*(?=\s*=)/y },
     { kind: "string", expression: /"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'/y },
diff --git a/website/src/components/brand/catalogFilters.ts b/website/src/components/brand/catalogFilters.ts
index c065c37c..f8f5dca2 100644
--- a/website/src/components/brand/catalogFilters.ts
+++ b/website/src/components/brand/catalogFilters.ts
@@ -14,7 +14,7 @@ export const updatedBuckets: { label: string; max: number }[] = [
   { label: "Older", max: Number.POSITIVE_INFINITY },
 ];
 
-/** Whole days between `lastUpdated` and now. Unparseable dates sort as oldest. */
+/** Whole days between `lastUpdated` and now. Unparsable dates sort as oldest. */
 export function daysSince(lastUpdated: string | undefined): number {
   if (!lastUpdated) return Number.POSITIVE_INFINITY;
   const then = Date.parse(lastUpdated);
diff --git a/website/src/components/brand/pagefindSearch.ts b/website/src/components/brand/pagefindSearch.ts
index 416a1a61..99908007 100644
--- a/website/src/components/brand/pagefindSearch.ts
+++ b/website/src/components/brand/pagefindSearch.ts
@@ -15,6 +15,19 @@ type PagefindResultData = {
   meta?: Record<string, string | undefined>;
 };
 
+/** Strip HTML tags, repeating until no more tags remain so a malformed or
+ * nested markup fragment (e.g. `<<script>script>`) can't survive a single pass. */
+function stripTags(html: string): string {
+  let text = html;
+  let previous: string;
+  do {
+    previous = text;
+    text = text.replace(/<[^>]*>/g, " ");
+  } while (text !== previous);
+  return text;
+}
+
+
 type PagefindModule = {
   options?: (opts: Record<string, unknown>) => Promise<void>;
   init?: () => Promise<void>;
@@ -127,7 +140,7 @@ export async function searchPagefind(
       if (!title) continue;
       items.push({
         title,
-        description: entry.excerpt?.replace(/<[^>]*>/g, "") ?? "",
+        description: entry.excerpt ? stripTags(entry.excerpt) : "",
         category: categoryOf(entry.url.split(/[?#]/)[0]),
         href: entry.url,
       });