diff --git a/web/templates/entry_view.html b/web/templates/entry_view.html
index 88951be..a30ba32 100644
--- a/web/templates/entry_view.html
+++ b/web/templates/entry_view.html
@@ -467,10 +467,10 @@ function showToast(message, duration = 3000) {
 }
 </script>
 
-<!-- Highlighter: only runs when user pref is enabled and when a last search exists -->
-<!-- Highlighter: only runs when user pref is enabled and when a last search exists -->
+<!-- Highlighter: uses exact DB field names -->
 <script>
 document.addEventListener("DOMContentLoaded", async () => {
+  // Respect per-user toggle
   let enabled = true;
   try {
     const res = await fetch("/api/get-prefs/");
@@ -478,14 +478,13 @@ document.addEventListener("DOMContentLoaded", async () => {
     if (prefs && typeof prefs.highlight_search_hits !== "undefined") {
       enabled = !!prefs.highlight_search_hits;
     }
-  } catch (e) { /* default true */ }
+  } catch (_) {}
   if (!enabled) return;
 
-  // Prefer the JS-literal fallback first (always valid for our Django output)
+  // Read last search (prefer JS-literal fallback, then JSON blob)
   let q = (window.__lastSearchQ || "").trim();
   let fields = Array.isArray(window.__lastSearchFields) ? window.__lastSearchFields : [];
 
-  // If not present, fall back to parsing the JSON <script> (for completeness)
   if ((!q || !fields.length)) {
     const dataEl = document.getElementById("last-search-data");
     if (dataEl) {
@@ -493,42 +492,36 @@ document.addEventListener("DOMContentLoaded", async () => {
         const payload = JSON.parse(dataEl.textContent || "{}");
         q = (payload.q || "").trim();
         fields = Array.isArray(payload.fields) ? payload.fields : [];
-      } catch (_) {
-        /* ignore */
-      }
+      } catch (_) {}
     }
   }
-
   if (!q || !fields.length) return;
 
-
-  // Map search field names -> selectors on this page
+  // Exact field -> selector mapping for your template IDs
   const fieldToSelector = {
-    subject: "#subject-list",
-    illustration: "#illustration-text",
-    application: "#application-text",
+    subject:       "#subject-list",
+    illustration:  "#illustration-text",
+    application:   "#application-text",
     scripture_raw: "#scripture-text",
-    source: "#source-text",
-    talk_title: "#talk_title-text",
-    talk_number: "#talk_title-text"
+    source:        "#source-text",
+    talk_title:    "#talk_title-text",
+    talk_number:   "#talk_title-text",
   };
 
-  // Tokenize similar to your search: quoted phrases kept; remove wildcard chars
+  // Tokenize like your search (keep quoted phrases, strip * and ?)
   const tokens = tokenize(q).map(t => t.replaceAll("*","").replaceAll("?","")).filter(Boolean);
   if (!tokens.length) return;
 
+  // Highlight only within fields that were searched
   for (const f of fields) {
     const sel = fieldToSelector[f];
-    if (!sel) continue;
+    if (!sel) continue;                         // ignore fields not shown on page
     const container = document.querySelector(sel);
     if (!container) continue;
-
-    for (const tok of tokens) {
-      highlightAll(container, tok);
-    }
+    for (const tok of tokens) highlightAll(container, tok);
   }
 
-  // --- helpers ---
+  // ---- helpers ----
   function tokenize(s) {
     const out = [];
     let i = 0, buf = "", inQ = false;
@@ -581,4 +574,5 @@ document.addEventListener("DOMContentLoaded", async () => {
   }
 });
 </script>
+
 {% endblock %}