From 08281be06246fe4a1ad3dce1f839ba0c4d7a3a90 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Sun, 24 Dec 2023 01:25:47 -0500
Subject: [PATCH] Fix search on Safari and handle errors and `::` queries

`::` needs to be escaped to a space, since `:` is handled specially
by lunrjs.

Errors during search get displayed on the page.

Avoid import for json files as Safari doens't support it. Instead write
a JS file which sets a variable, and load it through a script tag.

Generate search index items for things without pages of their own:
- fields
- methods
- aliases
---
 .../gen_tests/function-overloads/index.html   |  89 ++++++++----
 .../function-overloads/n-fn.multiple.0.html   |  93 ++++++++----
 .../function-overloads/n-fn.multiple.1.html   |  93 ++++++++----
 .../function-overloads/namespace.n.html       |  91 ++++++++----
 subdoc/gen_tests/markdown/N.html              |  91 ++++++++----
 subdoc/gen_tests/markdown/S.html              |  91 ++++++++----
 subdoc/gen_tests/markdown/Syntax.html         |  91 ++++++++----
 subdoc/gen_tests/markdown/index.html          |  89 ++++++++----
 subdoc/gen_tests/nested-namespace/index.html  |  89 ++++++++----
 .../namespace.outer_namespace.html            |  91 ++++++++----
 .../outer_namespace-fn.outer.html             |  93 ++++++++----
 ...er_namespace-inner_namespace-fn.inner.html |  95 ++++++++-----
 .../outer_namespace-namespace.empty.html      |  93 ++++++++----
 ...r_namespace-namespace.inner_namespace.html |  93 ++++++++----
 subdoc/gen_tests/struct-basic/S.html          |  91 ++++++++----
 subdoc/gen_tests/struct-basic/index.html      |  89 ++++++++----
 subdoc/gen_tests/struct-complex/Base.html     |  91 ++++++++----
 .../gen_tests/struct-complex/OtherType.html   |  91 ++++++++----
 subdoc/gen_tests/struct-complex/S.html        |  91 ++++++++----
 subdoc/gen_tests/struct-complex/index.html    |  89 ++++++++----
 .../macro.sus_macro_for_test.html             |  91 ++++++++----
 .../macro.sus_macro_for_test_fn.html          |  91 ++++++++----
 subdoc/gen_tests/subdoc-test-style.css        |   2 +-
 subdoc/gen_tests/templates/Concept.html       |  91 ++++++++----
 subdoc/gen_tests/templates/S.html             |  91 ++++++++----
 .../gen_tests/templates/TemplateMethods.html  |  91 ++++++++----
 .../gen_tests/templates/TemplateStruct.html   |  91 ++++++++----
 .../templates/fn.requires_overload.html       |  91 ++++++++----
 .../templates/fn.return_template.html         |  91 ++++++++----
 .../templates/fn.template_function.html       |  91 ++++++++----
 subdoc/gen_tests/templates/index.html         |  89 ++++++++----
 .../typenames-across-paths/index.html         |  89 ++++++++----
 .../n-FunctionParams.html                     |  93 ++++++++----
 .../typenames-across-paths/n-HoldS.html       |  93 ++++++++----
 .../typenames-across-paths/n-fn.pass_s.html   |  93 ++++++++----
 .../n-fn.return_nested.html                   |  93 ++++++++----
 .../typenames-across-paths/n-fn.return_s.html |  93 ++++++++----
 .../typenames-across-paths/namespace.n.html   |  91 ++++++++----
 .../namespace.other.html                      |  91 ++++++++----
 .../other-namespace.subother.html             |  93 ++++++++----
 .../other-subother-C.html                     |  95 ++++++++-----
 .../other-subother-S-FirstNested-Nested.html  |  99 ++++++++-----
 .../other-subother-S-FirstNested.html         |  97 ++++++++-----
 .../other-subother-S.html                     |  95 ++++++++-----
 .../other-subother-fn.subother_func.html      |  95 ++++++++-----
 ...ther_func_with_overload.hasanoverload.html |  95 ++++++++-----
 subdoc/lib/gen/generate.cc                    |   5 +-
 subdoc/lib/gen/generate_concept.cc            |   1 -
 subdoc/lib/gen/generate_cpp_path.cc           |   9 ++
 subdoc/lib/gen/generate_cpp_path.h            |   5 +
 subdoc/lib/gen/generate_function.cc           |   1 -
 subdoc/lib/gen/generate_head.cc               |  81 +++++++----
 subdoc/lib/gen/generate_macro.cc              |   1 -
 subdoc/lib/gen/generate_namespace.cc          |  99 +++++++++----
 subdoc/lib/gen/generate_record.cc             | 134 +++++++++++++++++-
 subdoc/lib/gen/html_writer.h                  |   6 -
 subdoc/lib/gen/json_writer.h                  |   9 +-
 57 files changed, 3049 insertions(+), 1441 deletions(-)

diff --git a/subdoc/gen_tests/function-overloads/index.html b/subdoc/gen_tests/function-overloads/index.html
index 3d06ec11c..b41f7056b 100644
--- a/subdoc/gen_tests/function-overloads/index.html
+++ b/subdoc/gen_tests/function-overloads/index.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -238,7 +269,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -254,7 +285,7 @@ <h1 class="search-results-header">
           <div class="section overview">
             <h1 class="section-header">
               <div>
-                <a class="project-name" data-pagefind-weight="0" href="#">PROJECT NAME</a>
+                <a class="project-name" href="#">PROJECT NAME</a>
               </div>
             </h1>
             <div class="description long">
diff --git a/subdoc/gen_tests/function-overloads/n-fn.multiple.0.html b/subdoc/gen_tests/function-overloads/n-fn.multiple.0.html
index e2d584c5d..2c1bcc67d 100644
--- a/subdoc/gen_tests/function-overloads/n-fn.multiple.0.html
+++ b/subdoc/gen_tests/function-overloads/n-fn.multiple.0.html
@@ -10,6 +10,7 @@
     <meta name="description" content="Function with overloads"></meta>
     <meta property="og:description" content="Function with overloads"></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,11 +281,11 @@ <h1 class="section-header">
               <span>
                 Function
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="namespace-name" data-pagefind-weight="1" href="namespace.n.html">n</a>
+              <a class="namespace-name" href="namespace.n.html">n</a>
               <span class="namespace-dots">::</span>
-              <a class="function-name" data-pagefind-weight="20" href="#">multiple</a>
+              <a class="function-name" href="#">multiple</a>
             </h1>
             <div class="overload-set">
               <div class="overload">
diff --git a/subdoc/gen_tests/function-overloads/n-fn.multiple.1.html b/subdoc/gen_tests/function-overloads/n-fn.multiple.1.html
index d05a0239d..652f5a111 100644
--- a/subdoc/gen_tests/function-overloads/n-fn.multiple.1.html
+++ b/subdoc/gen_tests/function-overloads/n-fn.multiple.1.html
@@ -10,6 +10,7 @@
     <meta name="description" content="Separated overload"></meta>
     <meta property="og:description" content="Separated overload"></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,11 +281,11 @@ <h1 class="section-header">
               <span>
                 Function
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="namespace-name" data-pagefind-weight="1" href="namespace.n.html">n</a>
+              <a class="namespace-name" href="namespace.n.html">n</a>
               <span class="namespace-dots">::</span>
-              <a class="function-name" data-pagefind-weight="20" href="#">multiple</a>
+              <a class="function-name" href="#">multiple</a>
             </h1>
             <div class="overload-set">
               <div class="overload">
diff --git a/subdoc/gen_tests/function-overloads/namespace.n.html b/subdoc/gen_tests/function-overloads/namespace.n.html
index afe4fa626..53faaa070 100644
--- a/subdoc/gen_tests/function-overloads/namespace.n.html
+++ b/subdoc/gen_tests/function-overloads/namespace.n.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -241,7 +272,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -261,9 +292,9 @@ <h1 class="section-header">
                 <span>
                   Namespace
                 </span>
-                <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+                <a class="project-name" href="index.html">PROJECT NAME</a>
                 <span class="namespace-dots">::</span>
-                <a class="namespace-name" data-pagefind-weight="10" href="#">n</a>
+                <a class="namespace-name" href="#">n</a>
               </div>
             </h1>
             <div class="description long">
diff --git a/subdoc/gen_tests/markdown/N.html b/subdoc/gen_tests/markdown/N.html
index 72c19f0e8..1887d5ce0 100644
--- a/subdoc/gen_tests/markdown/N.html
+++ b/subdoc/gen_tests/markdown/N.html
@@ -10,6 +10,7 @@
     <meta name="description" content="The summary has newlines in it."></meta>
     <meta property="og:description" content="The summary has newlines in it."></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,9 +281,9 @@ <h1 class="section-header">
               <span>
                 Struct
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="type-name" data-pagefind-weight="20" href="#">N</a>
+              <a class="type-name" href="#">N</a>
             </h1>
             <div class="type-signature"><div class="src rightside"><a href="test.cc#10">source</a></div><span class="struct">
                 struct
diff --git a/subdoc/gen_tests/markdown/S.html b/subdoc/gen_tests/markdown/S.html
index 64606c5e6..17629ab1b 100644
--- a/subdoc/gen_tests/markdown/S.html
+++ b/subdoc/gen_tests/markdown/S.html
@@ -10,6 +10,7 @@
     <meta name="description" content="The summary has html tags in it."></meta>
     <meta property="og:description" content="The summary has html tags in it."></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,9 +281,9 @@ <h1 class="section-header">
               <span>
                 Struct
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="type-name" data-pagefind-weight="20" href="#">S</a>
+              <a class="type-name" href="#">S</a>
             </h1>
             <div class="type-signature"><div class="src rightside"><a href="test.cc#5">source</a></div><span class="struct">
                 struct
diff --git a/subdoc/gen_tests/markdown/Syntax.html b/subdoc/gen_tests/markdown/Syntax.html
index bedb9ff00..22897b4ee 100644
--- a/subdoc/gen_tests/markdown/Syntax.html
+++ b/subdoc/gen_tests/markdown/Syntax.html
@@ -10,6 +10,7 @@
     <meta name="description" content="A code block with syntax highlighting."></meta>
     <meta property="og:description" content="A code block with syntax highlighting."></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,9 +281,9 @@ <h1 class="section-header">
               <span>
                 Struct
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="type-name" data-pagefind-weight="20" href="#">Syntax</a>
+              <a class="type-name" href="#">Syntax</a>
             </h1>
             <div class="type-signature"><div class="src rightside"><a href="test.cc#23">source</a></div><span class="struct">
                 struct
diff --git a/subdoc/gen_tests/markdown/index.html b/subdoc/gen_tests/markdown/index.html
index 1278a3900..72bb83e44 100644
--- a/subdoc/gen_tests/markdown/index.html
+++ b/subdoc/gen_tests/markdown/index.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -244,7 +275,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -260,7 +291,7 @@ <h1 class="search-results-header">
           <div class="section overview">
             <h1 class="section-header">
               <div>
-                <a class="project-name" data-pagefind-weight="0" href="#">PROJECT NAME</a>
+                <a class="project-name" href="#">PROJECT NAME</a>
               </div>
             </h1>
             <div class="description long">
diff --git a/subdoc/gen_tests/nested-namespace/index.html b/subdoc/gen_tests/nested-namespace/index.html
index 8c6917244..b3e664b2e 100644
--- a/subdoc/gen_tests/nested-namespace/index.html
+++ b/subdoc/gen_tests/nested-namespace/index.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -238,7 +269,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -254,7 +285,7 @@ <h1 class="search-results-header">
           <div class="section overview">
             <h1 class="section-header">
               <div>
-                <a class="project-name" data-pagefind-weight="0" href="#">PROJECT NAME</a>
+                <a class="project-name" href="#">PROJECT NAME</a>
               </div>
             </h1>
             <div class="description long">
diff --git a/subdoc/gen_tests/nested-namespace/namespace.outer_namespace.html b/subdoc/gen_tests/nested-namespace/namespace.outer_namespace.html
index 183403e75..959f314f8 100644
--- a/subdoc/gen_tests/nested-namespace/namespace.outer_namespace.html
+++ b/subdoc/gen_tests/nested-namespace/namespace.outer_namespace.html
@@ -10,6 +10,7 @@
     <meta name="description" content="Outer namespace"></meta>
     <meta property="og:description" content="Outer namespace"></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -244,7 +275,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -264,9 +295,9 @@ <h1 class="section-header">
                 <span>
                   Namespace
                 </span>
-                <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+                <a class="project-name" href="index.html">PROJECT NAME</a>
                 <span class="namespace-dots">::</span>
-                <a class="namespace-name" data-pagefind-weight="10" href="#">outer_namespace</a>
+                <a class="namespace-name" href="#">outer_namespace</a>
               </div>
             </h1>
             <div class="description long">
diff --git a/subdoc/gen_tests/nested-namespace/outer_namespace-fn.outer.html b/subdoc/gen_tests/nested-namespace/outer_namespace-fn.outer.html
index 763c1db36..6316eb337 100644
--- a/subdoc/gen_tests/nested-namespace/outer_namespace-fn.outer.html
+++ b/subdoc/gen_tests/nested-namespace/outer_namespace-fn.outer.html
@@ -10,6 +10,7 @@
     <meta name="description" content="Outer function"></meta>
     <meta property="og:description" content="Outer function"></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,11 +281,11 @@ <h1 class="section-header">
               <span>
                 Function
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="namespace-name" data-pagefind-weight="1" href="namespace.outer_namespace.html">outer_namespace</a>
+              <a class="namespace-name" href="namespace.outer_namespace.html">outer_namespace</a>
               <span class="namespace-dots">::</span>
-              <a class="function-name" data-pagefind-weight="20" href="#">outer</a>
+              <a class="function-name" href="#">outer</a>
             </h1>
             <div class="overload-set">
               <div class="overload">
diff --git a/subdoc/gen_tests/nested-namespace/outer_namespace-inner_namespace-fn.inner.html b/subdoc/gen_tests/nested-namespace/outer_namespace-inner_namespace-fn.inner.html
index 1ab2c024f..b91734ed5 100644
--- a/subdoc/gen_tests/nested-namespace/outer_namespace-inner_namespace-fn.inner.html
+++ b/subdoc/gen_tests/nested-namespace/outer_namespace-inner_namespace-fn.inner.html
@@ -10,6 +10,7 @@
     <meta name="description" content="Inner function"></meta>
     <meta property="og:description" content="Inner function"></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,13 +281,13 @@ <h1 class="section-header">
               <span>
                 Function
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="namespace-name" data-pagefind-weight="1" href="namespace.outer_namespace.html">outer_namespace</a>
+              <a class="namespace-name" href="namespace.outer_namespace.html">outer_namespace</a>
               <span class="namespace-dots">::</span>
-              <a class="namespace-name" data-pagefind-weight="1" href="outer_namespace-namespace.inner_namespace.html">inner_namespace</a>
+              <a class="namespace-name" href="outer_namespace-namespace.inner_namespace.html">inner_namespace</a>
               <span class="namespace-dots">::</span>
-              <a class="function-name" data-pagefind-weight="20" href="#">inner</a>
+              <a class="function-name" href="#">inner</a>
             </h1>
             <div class="overload-set">
               <div class="overload">
diff --git a/subdoc/gen_tests/nested-namespace/outer_namespace-namespace.empty.html b/subdoc/gen_tests/nested-namespace/outer_namespace-namespace.empty.html
index 8b442ae7d..6fe2ec420 100644
--- a/subdoc/gen_tests/nested-namespace/outer_namespace-namespace.empty.html
+++ b/subdoc/gen_tests/nested-namespace/outer_namespace-namespace.empty.html
@@ -10,6 +10,7 @@
     <meta name="description" content="Empty namespace"></meta>
     <meta property="og:description" content="Empty namespace"></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -252,11 +283,11 @@ <h1 class="section-header">
                 <span>
                   Namespace
                 </span>
-                <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+                <a class="project-name" href="index.html">PROJECT NAME</a>
                 <span class="namespace-dots">::</span>
-                <a class="namespace-name" data-pagefind-weight="1" href="namespace.outer_namespace.html">outer_namespace</a>
+                <a class="namespace-name" href="namespace.outer_namespace.html">outer_namespace</a>
                 <span class="namespace-dots">::</span>
-                <a class="namespace-name" data-pagefind-weight="10" href="#">empty</a>
+                <a class="namespace-name" href="#">empty</a>
               </div>
             </h1>
             <div class="description long">
diff --git a/subdoc/gen_tests/nested-namespace/outer_namespace-namespace.inner_namespace.html b/subdoc/gen_tests/nested-namespace/outer_namespace-namespace.inner_namespace.html
index c789c9d10..b9fe34a13 100644
--- a/subdoc/gen_tests/nested-namespace/outer_namespace-namespace.inner_namespace.html
+++ b/subdoc/gen_tests/nested-namespace/outer_namespace-namespace.inner_namespace.html
@@ -10,6 +10,7 @@
     <meta name="description" content="Inner namespace"></meta>
     <meta property="og:description" content="Inner namespace"></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -238,7 +269,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -258,11 +289,11 @@ <h1 class="section-header">
                 <span>
                   Namespace
                 </span>
-                <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+                <a class="project-name" href="index.html">PROJECT NAME</a>
                 <span class="namespace-dots">::</span>
-                <a class="namespace-name" data-pagefind-weight="1" href="namespace.outer_namespace.html">outer_namespace</a>
+                <a class="namespace-name" href="namespace.outer_namespace.html">outer_namespace</a>
                 <span class="namespace-dots">::</span>
-                <a class="namespace-name" data-pagefind-weight="10" href="#">inner_namespace</a>
+                <a class="namespace-name" href="#">inner_namespace</a>
               </div>
             </h1>
             <div class="description long">
diff --git a/subdoc/gen_tests/struct-basic/S.html b/subdoc/gen_tests/struct-basic/S.html
index 917c25c39..895201e72 100644
--- a/subdoc/gen_tests/struct-basic/S.html
+++ b/subdoc/gen_tests/struct-basic/S.html
@@ -10,6 +10,7 @@
     <meta name="description" content="Comment headline S"></meta>
     <meta property="og:description" content="Comment headline S"></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,9 +281,9 @@ <h1 class="section-header">
               <span>
                 Struct
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="type-name" data-pagefind-weight="20" href="#">S</a>
+              <a class="type-name" href="#">S</a>
             </h1>
             <div class="type-signature"><div class="src rightside"><a href="test.cc#5">source</a></div><span class="struct">
                 struct
diff --git a/subdoc/gen_tests/struct-basic/index.html b/subdoc/gen_tests/struct-basic/index.html
index 40dc1232f..67d967987 100644
--- a/subdoc/gen_tests/struct-basic/index.html
+++ b/subdoc/gen_tests/struct-basic/index.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -238,7 +269,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -254,7 +285,7 @@ <h1 class="search-results-header">
           <div class="section overview">
             <h1 class="section-header">
               <div>
-                <a class="project-name" data-pagefind-weight="0" href="#">PROJECT NAME</a>
+                <a class="project-name" href="#">PROJECT NAME</a>
               </div>
             </h1>
             <div class="description long">
diff --git a/subdoc/gen_tests/struct-complex/Base.html b/subdoc/gen_tests/struct-complex/Base.html
index 42c7f7ba4..d7bc84432 100644
--- a/subdoc/gen_tests/struct-complex/Base.html
+++ b/subdoc/gen_tests/struct-complex/Base.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -238,7 +269,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -256,9 +287,9 @@ <h1 class="section-header">
               <span>
                 Struct
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="type-name" data-pagefind-weight="20" href="#">Base</a>
+              <a class="type-name" href="#">Base</a>
             </h1>
             <div class="type-signature"><div class="src rightside"><a href="test.cc#20">source</a></div><span class="struct">
                 struct
diff --git a/subdoc/gen_tests/struct-complex/OtherType.html b/subdoc/gen_tests/struct-complex/OtherType.html
index f61397ebd..849ca7e52 100644
--- a/subdoc/gen_tests/struct-complex/OtherType.html
+++ b/subdoc/gen_tests/struct-complex/OtherType.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,9 +281,9 @@ <h1 class="section-header">
               <span>
                 Struct
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="type-name" data-pagefind-weight="20" href="#">OtherType</a>
+              <a class="type-name" href="#">OtherType</a>
             </h1>
             <div class="type-signature"><div class="src rightside"><a href="test.cc#16">source</a></div><span class="struct">
                 struct
diff --git a/subdoc/gen_tests/struct-complex/S.html b/subdoc/gen_tests/struct-complex/S.html
index c4cd0dd31..b1538238e 100644
--- a/subdoc/gen_tests/struct-complex/S.html
+++ b/subdoc/gen_tests/struct-complex/S.html
@@ -10,6 +10,7 @@
     <meta name="description" content="Comment headline S"></meta>
     <meta property="og:description" content="Comment headline S"></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -280,7 +311,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -298,9 +329,9 @@ <h1 class="section-header">
               <span>
                 Struct
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="type-name" data-pagefind-weight="20" href="#">S</a>
+              <a class="type-name" href="#">S</a>
             </h1>
             <div class="type-signature"><div class="src rightside"><a href="test.cc#26">source</a></div><span class="struct">
                 struct
diff --git a/subdoc/gen_tests/struct-complex/index.html b/subdoc/gen_tests/struct-complex/index.html
index f040806c4..c45dfd3cf 100644
--- a/subdoc/gen_tests/struct-complex/index.html
+++ b/subdoc/gen_tests/struct-complex/index.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -253,7 +284,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -269,7 +300,7 @@ <h1 class="search-results-header">
           <div class="section overview">
             <h1 class="section-header">
               <div>
-                <a class="project-name" data-pagefind-weight="0" href="#">PROJECT NAME</a>
+                <a class="project-name" href="#">PROJECT NAME</a>
               </div>
             </h1>
             <div class="description long">
diff --git a/subdoc/gen_tests/struct-complex/macro.sus_macro_for_test.html b/subdoc/gen_tests/struct-complex/macro.sus_macro_for_test.html
index 9617093e0..0608a3a44 100644
--- a/subdoc/gen_tests/struct-complex/macro.sus_macro_for_test.html
+++ b/subdoc/gen_tests/struct-complex/macro.sus_macro_for_test.html
@@ -10,6 +10,7 @@
     <meta name="description" content="Comment headline on sus_macro_for_test."></meta>
     <meta property="og:description" content="Comment headline on sus_macro_for_test."></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,9 +281,9 @@ <h1 class="section-header">
               <span>
                 Macro
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="macro-name" data-pagefind-weight="20" href="#">sus_macro_for_test</a>
+              <a class="macro-name" href="#">sus_macro_for_test</a>
             </h1>
             <div class="overload-set">
               <div class="overload">
diff --git a/subdoc/gen_tests/struct-complex/macro.sus_macro_for_test_fn.html b/subdoc/gen_tests/struct-complex/macro.sus_macro_for_test_fn.html
index 6ee30a2f1..b3ff7afcd 100644
--- a/subdoc/gen_tests/struct-complex/macro.sus_macro_for_test_fn.html
+++ b/subdoc/gen_tests/struct-complex/macro.sus_macro_for_test_fn.html
@@ -10,6 +10,7 @@
     <meta name="description" content="Comment headline on sus_macro_for_test_fn."></meta>
     <meta property="og:description" content="Comment headline on sus_macro_for_test_fn."></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,9 +281,9 @@ <h1 class="section-header">
               <span>
                 Macro
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="macro-name" data-pagefind-weight="20" href="#">sus_macro_for_test_fn</a>
+              <a class="macro-name" href="#">sus_macro_for_test_fn</a>
             </h1>
             <div class="overload-set">
               <div class="overload">
diff --git a/subdoc/gen_tests/subdoc-test-style.css b/subdoc/gen_tests/subdoc-test-style.css
index 509161713..1c8348b69 100644
--- a/subdoc/gen_tests/subdoc-test-style.css
+++ b/subdoc/gen_tests/subdoc-test-style.css
@@ -549,7 +549,7 @@ ul.item-table .item-name {
 }
 .search-results .search-results-type {
     font-size: 90%;
-    width: 15ex;
+    width: 18ex;
     flex-grow: 0;
 }
 .search-results .search-results-name {
diff --git a/subdoc/gen_tests/templates/Concept.html b/subdoc/gen_tests/templates/Concept.html
index f8446616e..58f771df5 100644
--- a/subdoc/gen_tests/templates/Concept.html
+++ b/subdoc/gen_tests/templates/Concept.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,9 +281,9 @@ <h1 class="section-header">
               <span>
                 Concept
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="concept-name" data-pagefind-weight="20" href="#">Concept</a>
+              <a class="concept-name" href="#">Concept</a>
             </h1>
             <div class="type-signature"><div class="src rightside"><a href="test.cc#7">source</a></div><pre class="template">template &lt;class T, class... U&gt;</pre><span class="concept">
                 concept
diff --git a/subdoc/gen_tests/templates/S.html b/subdoc/gen_tests/templates/S.html
index 71e184d6e..34cadbf63 100644
--- a/subdoc/gen_tests/templates/S.html
+++ b/subdoc/gen_tests/templates/S.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,9 +281,9 @@ <h1 class="section-header">
               <span>
                 Struct
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="type-name" data-pagefind-weight="20" href="#">S</a>
+              <a class="type-name" href="#">S</a>
             </h1>
             <div class="type-signature"><div class="src rightside"><a href="test.cc#10">source</a></div><pre class="template">template &lt;class T&gt;</pre><span class="struct">
                 struct
diff --git a/subdoc/gen_tests/templates/TemplateMethods.html b/subdoc/gen_tests/templates/TemplateMethods.html
index 08c9ce0f0..29f66bcf2 100644
--- a/subdoc/gen_tests/templates/TemplateMethods.html
+++ b/subdoc/gen_tests/templates/TemplateMethods.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -274,7 +305,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -292,9 +323,9 @@ <h1 class="section-header">
               <span>
                 Struct
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="type-name" data-pagefind-weight="20" href="#">TemplateMethods</a>
+              <a class="type-name" href="#">TemplateMethods</a>
             </h1>
             <div class="type-signature"><div class="src rightside"><a href="test.cc#13">source</a></div><pre class="template">template &lt;class T&gt;</pre><span class="struct">
                 struct
diff --git a/subdoc/gen_tests/templates/TemplateStruct.html b/subdoc/gen_tests/templates/TemplateStruct.html
index 6515501ec..f4ceb8f25 100644
--- a/subdoc/gen_tests/templates/TemplateStruct.html
+++ b/subdoc/gen_tests/templates/TemplateStruct.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,9 +281,9 @@ <h1 class="section-header">
               <span>
                 Struct
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="type-name" data-pagefind-weight="20" href="#">TemplateStruct</a>
+              <a class="type-name" href="#">TemplateStruct</a>
             </h1>
             <div class="type-signature"><div class="src rightside"><a href="test.cc#4">source</a></div><pre class="template">template &lt;class Type, auto AutoValue, class TypeWithDefault = int, TypeWithDefault ValueOfDependentType = 90210, class... Pack&gt;</pre><span class="struct">
                 struct
diff --git a/subdoc/gen_tests/templates/fn.requires_overload.html b/subdoc/gen_tests/templates/fn.requires_overload.html
index 66676be92..d4d470d00 100644
--- a/subdoc/gen_tests/templates/fn.requires_overload.html
+++ b/subdoc/gen_tests/templates/fn.requires_overload.html
@@ -10,6 +10,7 @@
     <meta name="description" content="Has two overloads."></meta>
     <meta property="og:description" content="Has two overloads."></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,9 +281,9 @@ <h1 class="section-header">
               <span>
                 Function
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="function-name" data-pagefind-weight="20" href="#">requires_overload</a>
+              <a class="function-name" href="#">requires_overload</a>
             </h1>
             <div class="overload-set">
               <div class="overload">
diff --git a/subdoc/gen_tests/templates/fn.return_template.html b/subdoc/gen_tests/templates/fn.return_template.html
index d9e233437..97b43a48b 100644
--- a/subdoc/gen_tests/templates/fn.return_template.html
+++ b/subdoc/gen_tests/templates/fn.return_template.html
@@ -10,6 +10,7 @@
     <meta name="description" content="Returns template instantiation."></meta>
     <meta property="og:description" content="Returns template instantiation."></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,9 +281,9 @@ <h1 class="section-header">
               <span>
                 Function
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="function-name" data-pagefind-weight="20" href="#">return_template</a>
+              <a class="function-name" href="#">return_template</a>
             </h1>
             <div class="overload-set">
               <div class="overload">
diff --git a/subdoc/gen_tests/templates/fn.template_function.html b/subdoc/gen_tests/templates/fn.template_function.html
index 0c0e97981..ba6df33ad 100644
--- a/subdoc/gen_tests/templates/fn.template_function.html
+++ b/subdoc/gen_tests/templates/fn.template_function.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,9 +281,9 @@ <h1 class="section-header">
               <span>
                 Function
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="function-name" data-pagefind-weight="20" href="#">template_function</a>
+              <a class="function-name" href="#">template_function</a>
             </h1>
             <div class="overload-set">
               <div class="overload">
diff --git a/subdoc/gen_tests/templates/index.html b/subdoc/gen_tests/templates/index.html
index d65ed0174..fd14518af 100644
--- a/subdoc/gen_tests/templates/index.html
+++ b/subdoc/gen_tests/templates/index.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -262,7 +293,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -278,7 +309,7 @@ <h1 class="search-results-header">
           <div class="section overview">
             <h1 class="section-header">
               <div>
-                <a class="project-name" data-pagefind-weight="0" href="#">PROJECT NAME</a>
+                <a class="project-name" href="#">PROJECT NAME</a>
               </div>
             </h1>
             <div class="description long">
diff --git a/subdoc/gen_tests/typenames-across-paths/index.html b/subdoc/gen_tests/typenames-across-paths/index.html
index 7e9390fe5..e10e5fd95 100644
--- a/subdoc/gen_tests/typenames-across-paths/index.html
+++ b/subdoc/gen_tests/typenames-across-paths/index.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -241,7 +272,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -257,7 +288,7 @@ <h1 class="search-results-header">
           <div class="section overview">
             <h1 class="section-header">
               <div>
-                <a class="project-name" data-pagefind-weight="0" href="#">PROJECT NAME</a>
+                <a class="project-name" href="#">PROJECT NAME</a>
               </div>
             </h1>
             <div class="description long">
diff --git a/subdoc/gen_tests/typenames-across-paths/n-FunctionParams.html b/subdoc/gen_tests/typenames-across-paths/n-FunctionParams.html
index cf41ab6a7..e1f45a0d9 100644
--- a/subdoc/gen_tests/typenames-across-paths/n-FunctionParams.html
+++ b/subdoc/gen_tests/typenames-across-paths/n-FunctionParams.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -268,7 +299,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -286,11 +317,11 @@ <h1 class="section-header">
               <span>
                 Struct
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="namespace-name" data-pagefind-weight="1" href="namespace.n.html">n</a>
+              <a class="namespace-name" href="namespace.n.html">n</a>
               <span class="namespace-dots">::</span>
-              <a class="type-name" data-pagefind-weight="20" href="#">FunctionParams</a>
+              <a class="type-name" href="#">FunctionParams</a>
             </h1>
             <div class="type-signature"><div class="src rightside"><a href="test.cc#97">source</a></div><span class="struct">
                 struct
diff --git a/subdoc/gen_tests/typenames-across-paths/n-HoldS.html b/subdoc/gen_tests/typenames-across-paths/n-HoldS.html
index 0871b7399..0bc140bf8 100644
--- a/subdoc/gen_tests/typenames-across-paths/n-HoldS.html
+++ b/subdoc/gen_tests/typenames-across-paths/n-HoldS.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -241,7 +272,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -259,11 +290,11 @@ <h1 class="section-header">
               <span>
                 Struct
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="namespace-name" data-pagefind-weight="1" href="namespace.n.html">n</a>
+              <a class="namespace-name" href="namespace.n.html">n</a>
               <span class="namespace-dots">::</span>
-              <a class="type-name" data-pagefind-weight="20" href="#">HoldS</a>
+              <a class="type-name" href="#">HoldS</a>
             </h1>
             <div class="type-signature"><div class="src rightside"><a href="test.cc#88">source</a></div><span class="struct">
                 struct
diff --git a/subdoc/gen_tests/typenames-across-paths/n-fn.pass_s.html b/subdoc/gen_tests/typenames-across-paths/n-fn.pass_s.html
index 057022438..da00f8e2d 100644
--- a/subdoc/gen_tests/typenames-across-paths/n-fn.pass_s.html
+++ b/subdoc/gen_tests/typenames-across-paths/n-fn.pass_s.html
@@ -10,6 +10,7 @@
     <meta name="description" content="Should show S as the paramter type, not the full path."></meta>
     <meta property="og:description" content="Should show S as the paramter type, not the full path."></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,11 +281,11 @@ <h1 class="section-header">
               <span>
                 Function
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="namespace-name" data-pagefind-weight="1" href="namespace.n.html">n</a>
+              <a class="namespace-name" href="namespace.n.html">n</a>
               <span class="namespace-dots">::</span>
-              <a class="function-name" data-pagefind-weight="20" href="#">pass_s</a>
+              <a class="function-name" href="#">pass_s</a>
             </h1>
             <div class="overload-set">
               <div class="overload">
diff --git a/subdoc/gen_tests/typenames-across-paths/n-fn.return_nested.html b/subdoc/gen_tests/typenames-across-paths/n-fn.return_nested.html
index 792def133..2b1a0653c 100644
--- a/subdoc/gen_tests/typenames-across-paths/n-fn.return_nested.html
+++ b/subdoc/gen_tests/typenames-across-paths/n-fn.return_nested.html
@@ -10,6 +10,7 @@
     <meta name="description" content="Should show Nested as the return type, not the full path."></meta>
     <meta property="og:description" content="Should show Nested as the return type, not the full path."></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,11 +281,11 @@ <h1 class="section-header">
               <span>
                 Function
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="namespace-name" data-pagefind-weight="1" href="namespace.n.html">n</a>
+              <a class="namespace-name" href="namespace.n.html">n</a>
               <span class="namespace-dots">::</span>
-              <a class="function-name" data-pagefind-weight="20" href="#">return_nested</a>
+              <a class="function-name" href="#">return_nested</a>
             </h1>
             <div class="overload-set">
               <div class="overload">
diff --git a/subdoc/gen_tests/typenames-across-paths/n-fn.return_s.html b/subdoc/gen_tests/typenames-across-paths/n-fn.return_s.html
index fec62d9d4..70f6d71a9 100644
--- a/subdoc/gen_tests/typenames-across-paths/n-fn.return_s.html
+++ b/subdoc/gen_tests/typenames-across-paths/n-fn.return_s.html
@@ -10,6 +10,7 @@
     <meta name="description" content="Should show S as the return type, not the full path."></meta>
     <meta property="og:description" content="Should show S as the return type, not the full path."></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,11 +281,11 @@ <h1 class="section-header">
               <span>
                 Function
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="namespace-name" data-pagefind-weight="1" href="namespace.n.html">n</a>
+              <a class="namespace-name" href="namespace.n.html">n</a>
               <span class="namespace-dots">::</span>
-              <a class="function-name" data-pagefind-weight="20" href="#">return_s</a>
+              <a class="function-name" href="#">return_s</a>
             </h1>
             <div class="overload-set">
               <div class="overload">
diff --git a/subdoc/gen_tests/typenames-across-paths/namespace.n.html b/subdoc/gen_tests/typenames-across-paths/namespace.n.html
index b72087bfb..0c00e300b 100644
--- a/subdoc/gen_tests/typenames-across-paths/namespace.n.html
+++ b/subdoc/gen_tests/typenames-across-paths/namespace.n.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -298,7 +329,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -318,9 +349,9 @@ <h1 class="section-header">
                 <span>
                   Namespace
                 </span>
-                <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+                <a class="project-name" href="index.html">PROJECT NAME</a>
                 <span class="namespace-dots">::</span>
-                <a class="namespace-name" data-pagefind-weight="10" href="#">n</a>
+                <a class="namespace-name" href="#">n</a>
               </div>
             </h1>
             <div class="description long">
diff --git a/subdoc/gen_tests/typenames-across-paths/namespace.other.html b/subdoc/gen_tests/typenames-across-paths/namespace.other.html
index 781b83ee7..6494fa348 100644
--- a/subdoc/gen_tests/typenames-across-paths/namespace.other.html
+++ b/subdoc/gen_tests/typenames-across-paths/namespace.other.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -238,7 +269,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -258,9 +289,9 @@ <h1 class="section-header">
                 <span>
                   Namespace
                 </span>
-                <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+                <a class="project-name" href="index.html">PROJECT NAME</a>
                 <span class="namespace-dots">::</span>
-                <a class="namespace-name" data-pagefind-weight="10" href="#">other</a>
+                <a class="namespace-name" href="#">other</a>
               </div>
             </h1>
             <div class="description long">
diff --git a/subdoc/gen_tests/typenames-across-paths/other-namespace.subother.html b/subdoc/gen_tests/typenames-across-paths/other-namespace.subother.html
index a441558cc..b653b0eb5 100644
--- a/subdoc/gen_tests/typenames-across-paths/other-namespace.subother.html
+++ b/subdoc/gen_tests/typenames-across-paths/other-namespace.subother.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -259,7 +290,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -279,11 +310,11 @@ <h1 class="section-header">
                 <span>
                   Namespace
                 </span>
-                <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+                <a class="project-name" href="index.html">PROJECT NAME</a>
                 <span class="namespace-dots">::</span>
-                <a class="namespace-name" data-pagefind-weight="1" href="namespace.other.html">other</a>
+                <a class="namespace-name" href="namespace.other.html">other</a>
                 <span class="namespace-dots">::</span>
-                <a class="namespace-name" data-pagefind-weight="10" href="#">subother</a>
+                <a class="namespace-name" href="#">subother</a>
               </div>
             </h1>
             <div class="description long">
diff --git a/subdoc/gen_tests/typenames-across-paths/other-subother-C.html b/subdoc/gen_tests/typenames-across-paths/other-subother-C.html
index 1dbc50b64..31582723d 100644
--- a/subdoc/gen_tests/typenames-across-paths/other-subother-C.html
+++ b/subdoc/gen_tests/typenames-across-paths/other-subother-C.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,13 +281,13 @@ <h1 class="section-header">
               <span>
                 Concept
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="namespace-name" data-pagefind-weight="1" href="namespace.other.html">other</a>
+              <a class="namespace-name" href="namespace.other.html">other</a>
               <span class="namespace-dots">::</span>
-              <a class="namespace-name" data-pagefind-weight="1" href="other-namespace.subother.html">subother</a>
+              <a class="namespace-name" href="other-namespace.subother.html">subother</a>
               <span class="namespace-dots">::</span>
-              <a class="concept-name" data-pagefind-weight="20" href="#">C</a>
+              <a class="concept-name" href="#">C</a>
             </h1>
             <div class="type-signature"><div class="src rightside"><a href="test.cc#9">source</a></div><pre class="template">template &lt;class T&gt;</pre><span class="concept">
                 concept
diff --git a/subdoc/gen_tests/typenames-across-paths/other-subother-S-FirstNested-Nested.html b/subdoc/gen_tests/typenames-across-paths/other-subother-S-FirstNested-Nested.html
index a0dc496f7..d534716b0 100644
--- a/subdoc/gen_tests/typenames-across-paths/other-subother-S-FirstNested-Nested.html
+++ b/subdoc/gen_tests/typenames-across-paths/other-subother-S-FirstNested-Nested.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,17 +281,17 @@ <h1 class="section-header">
               <span>
                 Struct
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="namespace-name" data-pagefind-weight="1" href="namespace.other.html">other</a>
+              <a class="namespace-name" href="namespace.other.html">other</a>
               <span class="namespace-dots">::</span>
-              <a class="namespace-name" data-pagefind-weight="1" href="other-namespace.subother.html">subother</a>
+              <a class="namespace-name" href="other-namespace.subother.html">subother</a>
               <span class="namespace-dots">::</span>
-              <a class="type-name" data-pagefind-weight="1" href="other-subother-S.html">S</a>
+              <a class="type-name" href="other-subother-S.html">S</a>
               <span class="namespace-dots">::</span>
-              <a class="type-name" data-pagefind-weight="1" href="other-subother-S-FirstNested.html">FirstNested</a>
+              <a class="type-name" href="other-subother-S-FirstNested.html">FirstNested</a>
               <span class="namespace-dots">::</span>
-              <a class="type-name" data-pagefind-weight="20" href="#">Nested</a>
+              <a class="type-name" href="#">Nested</a>
             </h1>
             <div class="type-signature"><div class="src rightside"><a href="test.cc#4">source</a></div><span class="struct">
                 struct
diff --git a/subdoc/gen_tests/typenames-across-paths/other-subother-S-FirstNested.html b/subdoc/gen_tests/typenames-across-paths/other-subother-S-FirstNested.html
index 6a3391443..1744fb98b 100644
--- a/subdoc/gen_tests/typenames-across-paths/other-subother-S-FirstNested.html
+++ b/subdoc/gen_tests/typenames-across-paths/other-subother-S-FirstNested.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,15 +281,15 @@ <h1 class="section-header">
               <span>
                 Struct
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="namespace-name" data-pagefind-weight="1" href="namespace.other.html">other</a>
+              <a class="namespace-name" href="namespace.other.html">other</a>
               <span class="namespace-dots">::</span>
-              <a class="namespace-name" data-pagefind-weight="1" href="other-namespace.subother.html">subother</a>
+              <a class="namespace-name" href="other-namespace.subother.html">subother</a>
               <span class="namespace-dots">::</span>
-              <a class="type-name" data-pagefind-weight="1" href="other-subother-S.html">S</a>
+              <a class="type-name" href="other-subother-S.html">S</a>
               <span class="namespace-dots">::</span>
-              <a class="type-name" data-pagefind-weight="20" href="#">FirstNested</a>
+              <a class="type-name" href="#">FirstNested</a>
             </h1>
             <div class="type-signature"><div class="src rightside"><a href="test.cc#3">source</a></div><span class="struct">
                 struct
diff --git a/subdoc/gen_tests/typenames-across-paths/other-subother-S.html b/subdoc/gen_tests/typenames-across-paths/other-subother-S.html
index c8ed34130..d809948b0 100644
--- a/subdoc/gen_tests/typenames-across-paths/other-subother-S.html
+++ b/subdoc/gen_tests/typenames-across-paths/other-subother-S.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,13 +281,13 @@ <h1 class="section-header">
               <span>
                 Struct
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="namespace-name" data-pagefind-weight="1" href="namespace.other.html">other</a>
+              <a class="namespace-name" href="namespace.other.html">other</a>
               <span class="namespace-dots">::</span>
-              <a class="namespace-name" data-pagefind-weight="1" href="other-namespace.subother.html">subother</a>
+              <a class="namespace-name" href="other-namespace.subother.html">subother</a>
               <span class="namespace-dots">::</span>
-              <a class="type-name" data-pagefind-weight="20" href="#">S</a>
+              <a class="type-name" href="#">S</a>
             </h1>
             <div class="type-signature"><div class="src rightside"><a href="test.cc#2">source</a></div><span class="struct">
                 struct
diff --git a/subdoc/gen_tests/typenames-across-paths/other-subother-fn.subother_func.html b/subdoc/gen_tests/typenames-across-paths/other-subother-fn.subother_func.html
index 5dbf1585a..cb00a7bd2 100644
--- a/subdoc/gen_tests/typenames-across-paths/other-subother-fn.subother_func.html
+++ b/subdoc/gen_tests/typenames-across-paths/other-subother-fn.subother_func.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,13 +281,13 @@ <h1 class="section-header">
               <span>
                 Function
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="namespace-name" data-pagefind-weight="1" href="namespace.other.html">other</a>
+              <a class="namespace-name" href="namespace.other.html">other</a>
               <span class="namespace-dots">::</span>
-              <a class="namespace-name" data-pagefind-weight="1" href="other-namespace.subother.html">subother</a>
+              <a class="namespace-name" href="other-namespace.subother.html">subother</a>
               <span class="namespace-dots">::</span>
-              <a class="function-name" data-pagefind-weight="20" href="#">subother_func</a>
+              <a class="function-name" href="#">subother_func</a>
             </h1>
             <div class="overload-set">
               <div class="overload">
diff --git a/subdoc/gen_tests/typenames-across-paths/other-subother-fn.subother_func_with_overload.hasanoverload.html b/subdoc/gen_tests/typenames-across-paths/other-subother-fn.subother_func_with_overload.hasanoverload.html
index c93f060d8..4089033d0 100644
--- a/subdoc/gen_tests/typenames-across-paths/other-subother-fn.subother_func_with_overload.hasanoverload.html
+++ b/subdoc/gen_tests/typenames-across-paths/other-subother-fn.subother_func_with_overload.hasanoverload.html
@@ -10,6 +10,7 @@
     <meta name="description" content=""></meta>
     <meta property="og:description" content=""></meta>
     <script src="https://unpkg.com/lunr/lunr.js"></script>
+    <script src="./search_db.js"></script>
     <script>
       
         // Delayed loading of whatever was in the search box.
@@ -31,7 +32,7 @@
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -53,9 +54,16 @@
               e.preventDefault();
             }
           };
+          var searchPlaceholder;
           document.querySelector(".search-input").onfocus = (e) => {
+            searchPlaceholder = e.target.placeholder;
+            e.target.placeholder = "Type your search here.";
             navigateToSearch(e.target.value);
           };
+          document.querySelector(".search-input").onblur = (e) => {
+            e.target.placeholder = searchPlaceholder;
+            searchPlaceholder = null;
+          };
         });
 
         // Show or hide any DOM element.
@@ -80,24 +88,32 @@
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -117,12 +133,14 @@
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -146,6 +164,16 @@
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -159,7 +187,7 @@
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -178,6 +206,9 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -185,8 +216,8 @@
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
@@ -232,7 +263,7 @@
     <main>
       <nav class="search-nav">
         <form class="search-form">
-          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search..." onblur="this.placeholder = 'Click or press \'S\' to search...'" onfocus="this.placeholder = 'Type your search here.'">
+          <input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press 'S' to search...">
           </input>
         </form>
       </nav>
@@ -250,13 +281,13 @@ <h1 class="section-header">
               <span>
                 Function
               </span>
-              <a class="project-name" data-pagefind-weight="1" href="index.html">PROJECT NAME</a>
+              <a class="project-name" href="index.html">PROJECT NAME</a>
               <span class="namespace-dots">::</span>
-              <a class="namespace-name" data-pagefind-weight="1" href="namespace.other.html">other</a>
+              <a class="namespace-name" href="namespace.other.html">other</a>
               <span class="namespace-dots">::</span>
-              <a class="namespace-name" data-pagefind-weight="1" href="other-namespace.subother.html">subother</a>
+              <a class="namespace-name" href="other-namespace.subother.html">subother</a>
               <span class="namespace-dots">::</span>
-              <a class="function-name" data-pagefind-weight="20" href="#">subother_func_with_overload</a>
+              <a class="function-name" href="#">subother_func_with_overload</a>
             </h1>
             <div class="overload-set">
               <div class="overload">
diff --git a/subdoc/lib/gen/generate.cc b/subdoc/lib/gen/generate.cc
index 4713a929c..98d3d3b65 100644
--- a/subdoc/lib/gen/generate.cc
+++ b/subdoc/lib/gen/generate.cc
@@ -77,9 +77,10 @@ sus::result::Result<void, sus::Box<sus::error::DynError>> generate(
 
   {
     std::filesystem::path search_json_path = options.output_root;
-    search_json_path.append("search.json");
+    search_json_path.append("search_db.js");
     auto json_writer =
-        JsonWriter(open_file_for_writing(search_json_path).unwrap());
+        JsonWriter(sus::some("g_search_db"),
+                   open_file_for_writing(search_json_path).unwrap());
     auto search_documents = json_writer.open_array();
 
     if (auto result = generate_namespace(db, db.global, sus::empty,
diff --git a/subdoc/lib/gen/generate_concept.cc b/subdoc/lib/gen/generate_concept.cc
index b9b44996b..87ce1c052 100644
--- a/subdoc/lib/gen/generate_concept.cc
+++ b/subdoc/lib/gen/generate_concept.cc
@@ -65,7 +65,6 @@ void generate_concept_overview(HtmlWriter::OpenDiv& record_div,
           span.write_text("::");
         }
         auto ancestor_anchor = header.open_a();
-        ancestor_anchor.add_search_weight(e.search_weight);
         ancestor_anchor.add_class([&e]() {
           switch (e.type) {
             case CppPathProject: return "project-name";
diff --git a/subdoc/lib/gen/generate_cpp_path.cc b/subdoc/lib/gen/generate_cpp_path.cc
index b971ece1c..7682c08cb 100644
--- a/subdoc/lib/gen/generate_cpp_path.cc
+++ b/subdoc/lib/gen/generate_cpp_path.cc
@@ -140,6 +140,15 @@ Vec<CppPathElement> generate_cpp_path_for_function(
                                  sus::Slice<const RecordElement*>(), options);
 }
 
+Vec<CppPathElement> generate_cpp_path_for_alias(
+    const AliasElement& element,
+    sus::Slice<const NamespaceElement*> namespace_ancestors,
+    const Options& options) noexcept {
+  return generate_with_ancestors(element.name, CppPathFunction,
+                                 namespace_ancestors,
+                                 sus::Slice<const RecordElement*>(), options);
+}
+
 Vec<CppPathElement> generate_cpp_path_for_macro(
     const MacroElement& element,
     sus::Slice<const NamespaceElement*> namespace_ancestors,
diff --git a/subdoc/lib/gen/generate_cpp_path.h b/subdoc/lib/gen/generate_cpp_path.h
index 8e1f30abb..76934702e 100644
--- a/subdoc/lib/gen/generate_cpp_path.h
+++ b/subdoc/lib/gen/generate_cpp_path.h
@@ -59,6 +59,11 @@ Vec<CppPathElement> generate_cpp_path_for_function(
     sus::Slice<const NamespaceElement*> namespace_ancestors,
     const Options& options) noexcept;
 
+Vec<CppPathElement> generate_cpp_path_for_alias(
+    const AliasElement& element,
+    sus::Slice<const NamespaceElement*> namespace_ancestors,
+    const Options& options) noexcept;
+
 Vec<CppPathElement> generate_cpp_path_for_macro(
     const MacroElement& element,
     sus::Slice<const NamespaceElement*> namespace_ancestors,
diff --git a/subdoc/lib/gen/generate_function.cc b/subdoc/lib/gen/generate_function.cc
index a01e58522..c1fe03754 100644
--- a/subdoc/lib/gen/generate_function.cc
+++ b/subdoc/lib/gen/generate_function.cc
@@ -299,7 +299,6 @@ sus::Result<void, MarkdownToHtmlError> generate_function(
           span.write_text("::");
         }
         auto ancestor_anchor = header.open_a();
-        ancestor_anchor.add_search_weight(e.search_weight);
         ancestor_anchor.add_class([&e]() {
           switch (e.type) {
             case CppPathProject: return "project-name";
diff --git a/subdoc/lib/gen/generate_head.cc b/subdoc/lib/gen/generate_head.cc
index 2657b5c2d..64e21fecc 100644
--- a/subdoc/lib/gen/generate_head.cc
+++ b/subdoc/lib/gen/generate_head.cc
@@ -76,6 +76,10 @@ void generate_head(HtmlWriter& html, std::string_view title,
     }
 
     // Script for showing search results.
+    {
+      auto script = head.open_script(HtmlWriter::SingleLine);
+      script.add_src("./search_db.js");
+    }
     {
       auto script = head.open_script();
       script.write_html(R"#(
@@ -98,7 +102,7 @@ void generate_head(HtmlWriter& html, std::string_view title,
           searchDelayLoad = null;
 
           let without_search =
-              window.location.href.replace(window.location.search, '');
+              window.location.origin + window.location.pathname;
           if (query) {
             window.history.replaceState(null, "",
               without_search + "?" + `search=${query}`);
@@ -154,24 +158,32 @@ void generate_head(HtmlWriter& html, std::string_view title,
           const search_db = loaded.search_db;
           const idx = loaded.idx;
 
-          const results = idx.search(searchQuery());
+          // lunrjs treats `:` specially and `::` breaks the query syntax, so
+          // just split into two words.
+          const query = searchQuery().split("::").join(" ");
           let content = '';
-          for (r of results) {
-            const item = search_db[r.ref];
-            
-            const type = item.type;
-            const url = item.url;
-            const name = item.name;
-            const full_name = item.full_name;
-            const summmary = item.summary ? item.summary : "";
-            
-            content += `\
-              <a class="search-results-link" href="${url}">
-                <span class="search-results-type">${type}</span>\
-                <span class="search-results-name">${full_name}</span>\
-                <span class="search-results-summary">${summmary}</span>\
-              </a>\
-              `
+          try {
+            const results = idx.search(query);
+            for (r of results) {
+              const item = search_db[r.ref];
+
+              const type = item.type;
+              const url = item.url;
+              const name = item.name;
+              const full_name = item.full_name;
+              const summmary = item.summary ? item.summary : "";
+
+              content += `\
+                <a class="search-results-link" href="${url}">
+                  <span class="search-results-type">${type}</span>\
+                  <span class="search-results-name">${full_name}</span>\
+                  <span class="search-results-summary">${summmary}</span>\
+                </a>\
+                `
+            }
+          } catch (err) {
+            content +=
+                `<div class="search-error">Search error: ${err.message}</div>`;
           }
 
           let content_elem = document.querySelector(".search-results-content");
@@ -191,12 +203,14 @@ void generate_head(HtmlWriter& html, std::string_view title,
         // - idx: the lunr search index.
         //   Documented at https://lunrjs.com/docs/lunr.Index.html.
         async function loadSearchIndex() {
-          async function load_search_db() {
-            let x = await import('./search.json', {
-              assert: {type: 'json'}
-            });
-            return x.default;
-          }
+          // This is not widely supported yet (not on Safari), so instead we
+          // turned the json file into a js file that sets a global variable. :|
+          //async function load_search_db() {
+          //  let x = await import('./search.json', {
+          //    with: {type: 'json'}
+          //  });
+          //  return x.default;
+          //}
 
           async function load_idx(search_db) {
             let idx = lunr(function () {
@@ -220,6 +234,16 @@ void generate_head(HtmlWriter& html, std::string_view title,
               // No stemming?
               // this.pipeline = new lunr.Pipeline();
 
+              this.use(builder => {
+                function splitColons(token) {
+                  return token.toString().split("::").map(str => {
+                    return token.clone().update(() => { return str })
+                  })
+                }
+                lunr.Pipeline.registerFunction(splitColons, 'splitColons')
+                builder.searchPipeline.before(lunr.stemmer, splitColons)
+              });
+
               search_db.forEach(item => {
                 this.add(item, {
                   'boost': item.weight
@@ -233,7 +257,7 @@ void generate_head(HtmlWriter& html, std::string_view title,
           };
 
           if (!cache_idx) {
-            cache_idx = await load_search_db().then(load_idx);
+            cache_idx = await load_idx(g_search_db);
           }
           return cache_idx;
         }
@@ -252,6 +276,9 @@ void generate_head(HtmlWriter& html, std::string_view title,
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "Loading search results...";
 
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
+
             loadSearchIndex().then(populateSearchResults)
           } else {
             showHide(".main-content", true);
@@ -259,8 +286,8 @@ void generate_head(HtmlWriter& html, std::string_view title,
             let header_elem = document.querySelector(".search-results-header");
             header_elem.innerText = "";
 
-            let content_elem = document.querySelector(".search-results-content");
-            content_elem.innerText = "";
+            let content_ele = document.querySelector(".search-results-content");
+            content_ele.innerText = "";
           }
         }
 
diff --git a/subdoc/lib/gen/generate_macro.cc b/subdoc/lib/gen/generate_macro.cc
index 0c23bba66..ff11ef48a 100644
--- a/subdoc/lib/gen/generate_macro.cc
+++ b/subdoc/lib/gen/generate_macro.cc
@@ -129,7 +129,6 @@ sus::Result<void, MarkdownToHtmlError> generate_macro(
           span.write_text("::");
         }
         auto ancestor_anchor = header.open_a();
-        ancestor_anchor.add_search_weight(e.search_weight);
         ancestor_anchor.add_class([&e]() {
           switch (e.type) {
             case CppPathProject: return "project-name";
diff --git a/subdoc/lib/gen/generate_namespace.cc b/subdoc/lib/gen/generate_namespace.cc
index 94279c6d7..64555d555 100644
--- a/subdoc/lib/gen/generate_namespace.cc
+++ b/subdoc/lib/gen/generate_namespace.cc
@@ -163,7 +163,7 @@ void generate_namespace_overview(HtmlWriter::OpenDiv& namespace_div,
   {
     auto header = section_div.open_h(1u);
     header.add_class("section-header");
-    
+
     auto header_div = header.open_div();
     generate_source_link(header_div, element);
 
@@ -185,7 +185,6 @@ void generate_namespace_overview(HtmlWriter::OpenDiv& namespace_div,
           span.write_text("::");
         }
         auto ancestor_anchor = header_div.open_a();
-        ancestor_anchor.add_search_weight(e.search_weight);
         ancestor_anchor.add_class([&e]() {
           switch (e.type) {
             case CppPathProject: return "project-name";
@@ -558,37 +557,80 @@ sus::Result<void, MarkdownToHtmlError> generate_namespace(
   if (element.hidden()) return sus::ok();
 
   {
-    i32 index = search_documents.len();
-    auto json = search_documents.open_object();
-    switch (element.namespace_name) {
-      case Namespace::Tag::Global: {
-        json.add_int("index", index);
-        json.add_string("type", "project");
-        json.add_string("url", construct_html_url_for_namespace(element));
-        json.add_string("name", options.project_name);
-        json.add_string("full_name", options.project_name);
-        break;
+    std::string namespace_cpp_path;
+    for (CppPathElement e :
+         generate_cpp_path_for_namespace(element, ancestors, options)
+             .into_iter()) {
+      if (e.type != CppPathProject) {
+        if (namespace_cpp_path.size() > 0u)
+          namespace_cpp_path += std::string_view("::");
+        namespace_cpp_path += e.name;
+      }
+    }
+
+    {
+      i32 index = search_documents.len();
+      auto json = search_documents.open_object();
+      switch (element.namespace_name) {
+        case Namespace::Tag::Global: {
+          json.add_int("index", index);
+          json.add_string("type", "project");
+          json.add_string("url", construct_html_url_for_namespace(element));
+          json.add_string("name", options.project_name);
+          json.add_string("full_name", options.project_name);
+          break;
+        }
+        case Namespace::Tag::Anonymous: sus_unreachable();
+        case Namespace::Tag::Named: {
+          json.add_int("index", index);
+          json.add_string("type", "namespace");
+          json.add_string("url", construct_html_url_for_namespace(element));
+          json.add_string("weight", "0.75");
+          json.add_string("name", element.name);
+
+          std::string full_name = namespace_cpp_path;
+          json.add_string("full_name", namespace_cpp_path);
+          json.add_string("split_name", split_for_search(full_name));
+          break;
+        }
       }
-      case Namespace::Tag::Anonymous: sus_unreachable();
-      case Namespace::Tag::Named: {
+    }
+    for (const auto& [alias_id, sub_element] : element.aliases) {
+      if (sub_element.hidden()) continue;
+
+      if (Option<std::string> url = construct_html_url_for_alias(sub_element);
+          url.is_some()) {
+        i32 index = search_documents.len();
+        auto json = search_documents.open_object();
         json.add_int("index", index);
-        json.add_string("type", "namespace");
-        json.add_string("url", construct_html_url_for_namespace(element));
-        json.add_string("weight", "0.75");
-        json.add_string("name", element.name);
-
-        std::string full_name;
-        for (CppPathElement e :
-             generate_cpp_path_for_namespace(element, ancestors, options)
-                 .into_iter()) {
-          if (e.type != CppPathProject) {
-            if (full_name.size() > 0u) full_name += std::string_view("::");
-            full_name += e.name;
-          }
+        switch (sub_element.target) {
+          case AliasTarget::Tag::AliasOfType:
+            json.add_string("type", "type alias");
+            break;
+          case AliasTarget::Tag::AliasOfConcept:
+            json.add_string("type", "concept alias");
+            break;
+          case AliasTarget::Tag::AliasOfFunction:
+            json.add_string("type", "function alias");
+            break;
+          case AliasTarget::Tag::AliasOfMethod:
+            json.add_string("type", "method alias");
+            break;
+          case AliasTarget::Tag::AliasOfEnumConstant:
+            json.add_string("type", "enum value alias");
+            break;
+          case AliasTarget::Tag::AliasOfVariable:
+            json.add_string("type", "variable alias");
+            break;
         }
+        json.add_string("url", url.as_value());
+        json.add_string("weight", "0.8");
+        json.add_string("name", sub_element.name);
+        std::string full_name = namespace_cpp_path;
+        full_name += std::string_view("::");
+        full_name += sub_element.name;
         json.add_string("full_name", full_name);
         json.add_string("split_name", split_for_search(full_name));
-        break;
       }
     }
   }
@@ -1004,6 +1046,7 @@ sus::Result<void, MarkdownToHtmlError> generate_namespace(
 
   // Recurse into namespaces, concepts, records and functions.
   ancestors.push(&element);
+
   for (const auto& [u, sub_element] : element.namespaces) {
     if (sub_element.hidden()) continue;
     if (auto result = generate_namespace(db, sub_element, sus::clone(ancestors),
diff --git a/subdoc/lib/gen/generate_record.cc b/subdoc/lib/gen/generate_record.cc
index f391ac635..4cf32f7b5 100644
--- a/subdoc/lib/gen/generate_record.cc
+++ b/subdoc/lib/gen/generate_record.cc
@@ -123,7 +123,6 @@ void generate_record_overview(HtmlWriter::OpenDiv& record_div,
           span.write_text("::");
         }
         auto ancestor_anchor = header.open_a();
-        ancestor_anchor.add_search_weight(e.search_weight);
         ancestor_anchor.add_class([&e]() {
           switch (e.type) {
             case CppPathProject: return "project-name";
@@ -335,6 +334,139 @@ sus::Result<void, MarkdownToHtmlError> generate_record(
     json.add_string("full_name", full_name);
     json.add_string("split_name", split_for_search(full_name));
   }
+  {
+    std::string type_cpp_path;
+    for (CppPathElement e : generate_cpp_path_for_type(element, namespaces,
+                                                       type_ancestors, options)
+                                .into_iter()) {
+      if (e.type != CppPathProject) {
+        if (type_cpp_path.size() > 0u) type_cpp_path += std::string_view("::");
+        type_cpp_path += e.name;
+      }
+    }
+    for (const auto& [id, sub_element] : element.fields) {
+      if (sub_element.hidden()) continue;
+
+      i32 index = search_documents.len();
+      auto json = search_documents.open_object();
+      json.add_int("index", index);
+      json.add_string("type", "field");
+      json.add_string("url", construct_html_url_for_field(sub_element));
+      json.add_string("weight", "0.9");
+      json.add_string("name", sub_element.name);
+      std::string full_name =
+          type_cpp_path + std::string("::") + sub_element.name;
+      json.add_string("full_name", full_name);
+      json.add_string("split_name", split_for_search(full_name));
+    }
+    for (const auto& [id, sub_element] : element.deductions) {
+      if (sub_element.hidden()) continue;
+
+      i32 index = search_documents.len();
+      auto json = search_documents.open_object();
+      json.add_int("index", index);
+      json.add_string("type", "deduction guide");
+      json.add_string("url", construct_html_url_for_function(sub_element));
+      json.add_string("name", sub_element.name);
+      std::string full_name =
+          type_cpp_path + std::string("::") + sub_element.name;
+      json.add_string("full_name", full_name);
+      json.add_string("split_name", split_for_search(full_name));
+    }
+    for (const auto& [id, sub_element] : element.ctors) {
+      if (sub_element.hidden()) continue;
+
+      i32 index = search_documents.len();
+      auto json = search_documents.open_object();
+      json.add_int("index", index);
+      json.add_string("type", "constructor");
+      json.add_string("url", construct_html_url_for_function(sub_element));
+      json.add_string("name", sub_element.name);
+      std::string full_name =
+          type_cpp_path + std::string("::") + sub_element.name;
+      json.add_string("full_name", full_name);
+      json.add_string("split_name", split_for_search(full_name));
+    }
+    for (const auto& [id, sub_element] : element.dtors) {
+      if (sub_element.hidden()) continue;
+
+      i32 index = search_documents.len();
+      auto json = search_documents.open_object();
+      json.add_int("index", index);
+      json.add_string("type", "destructor");
+      json.add_string("url", construct_html_url_for_function(sub_element));
+      json.add_string("name", sub_element.name);
+      std::string full_name =
+          type_cpp_path + std::string("::") + sub_element.name;
+      json.add_string("full_name", full_name);
+      json.add_string("split_name", split_for_search(full_name));
+    }
+    for (const auto& [id, sub_element] : element.conversions) {
+      if (sub_element.hidden()) continue;
+
+      i32 index = search_documents.len();
+      auto json = search_documents.open_object();
+      json.add_int("index", index);
+      json.add_string("type", "conversion");
+      json.add_string("url", construct_html_url_for_function(sub_element));
+      json.add_string("name", sub_element.name);
+      std::string full_name =
+          type_cpp_path + std::string("::") + sub_element.name;
+      json.add_string("full_name", full_name);
+      json.add_string("split_name", split_for_search(full_name));
+    }
+    for (const auto& [id, sub_element] : element.methods) {
+      if (sub_element.hidden()) continue;
+
+      i32 index = search_documents.len();
+      auto json = search_documents.open_object();
+      json.add_int("index", index);
+      json.add_string("type", "method");
+      json.add_string("url", construct_html_url_for_function(sub_element));
+      json.add_string("name", sub_element.name);
+      std::string full_name =
+          type_cpp_path + std::string("::") + sub_element.name;
+      json.add_string("full_name", full_name);
+      json.add_string("split_name", split_for_search(full_name));
+    }
+    for (const auto& [id, sub_element] : element.aliases) {
+      if (sub_element.hidden()) continue;
+
+      if (Option<std::string> url = construct_html_url_for_alias(sub_element);
+          url.is_some()) {
+        i32 index = search_documents.len();
+        auto json = search_documents.open_object();
+        json.add_int("index", index);
+        switch (sub_element.target) {
+          case AliasTarget::Tag::AliasOfType:
+            json.add_string("type", "type alias");
+            break;
+          case AliasTarget::Tag::AliasOfConcept:
+            json.add_string("type", "concept alias");
+            break;
+          case AliasTarget::Tag::AliasOfFunction:
+            json.add_string("type", "function alias");
+            break;
+          case AliasTarget::Tag::AliasOfMethod:
+            json.add_string("type", "method alias");
+            break;
+          case AliasTarget::Tag::AliasOfEnumConstant:
+            json.add_string("type", "enum value alias");
+            break;
+          case AliasTarget::Tag::AliasOfVariable:
+            json.add_string("type", "variable alias");
+            break;
+        }
+        json.add_string("url", url.as_value());
+        json.add_string("weight", "0.8");
+        json.add_string("name", sub_element.name);
+        std::string full_name =
+            type_cpp_path + std::string("::") + sub_element.name;
+        json.add_string("full_name", full_name);
+        json.add_string("split_name", split_for_search(full_name));
+      }
+    }
+  }
 
   ParseMarkdownPageState page_state(db, options);
 
diff --git a/subdoc/lib/gen/html_writer.h b/subdoc/lib/gen/html_writer.h
index 0d0d091d1..b1aaf9144 100644
--- a/subdoc/lib/gen/html_writer.h
+++ b/subdoc/lib/gen/html_writer.h
@@ -44,12 +44,6 @@ class HtmlWriter {
           .value = std::string(id),
       });
     }
-    void add_search_weight(f32 weight) noexcept {
-      attributes_.push(HtmlAttribute{
-          .name = std::string("data-pagefind-weight"),
-          .value = fmt::to_string(weight),
-      });
-    }
 
     void write_text(std::string_view text) noexcept {
       write_open();
diff --git a/subdoc/lib/gen/json_writer.h b/subdoc/lib/gen/json_writer.h
index 995a36c1e..a8e4c6768 100644
--- a/subdoc/lib/gen/json_writer.h
+++ b/subdoc/lib/gen/json_writer.h
@@ -131,8 +131,13 @@ class JsonWriter {
     JsonWriter* writer_;
   };
 
-  explicit JsonWriter(std::ofstream stream) noexcept
-      : stream_(sus::move(stream)) {}
+  explicit JsonWriter(Option<std::string> varname,
+                      std::ofstream stream) noexcept
+      : stream_(sus::move(stream)) {
+    if (varname.is_some()) {
+      stream_ << "const " << varname.as_value() << " = ";
+    }
+  }
   ~JsonWriter() noexcept = default;
 
   JsonArray open_array() noexcept {