diff --git a/layouts/_partials/page-metadata/item/authors.html b/layouts/_partials/page-metadata/item/authors.html
index 58ed963..1a2d21a 100644
--- a/layouts/_partials/page-metadata/item/authors.html
+++ b/layouts/_partials/page-metadata/item/authors.html
@@ -1,5 +1,5 @@
 {{ with .Params.authors }}
-    <span class="page-metadata-item" aria-label="{{ i18n "aria_post_meta_authors" }}">
+    <span class="page-metadata-item" data-pagefind-meta="authors" aria-label="{{ i18n "aria_post_meta_authors" }}">
         {{ partial "icon.html" "user-circle" }}
 
         {{ if index $.Site.Taxonomies "authors" }}
diff --git a/layouts/_partials/page-metadata/item/categories.html b/layouts/_partials/page-metadata/item/categories.html
index 469f26a..d1f35dc 100644
--- a/layouts/_partials/page-metadata/item/categories.html
+++ b/layouts/_partials/page-metadata/item/categories.html
@@ -4,7 +4,7 @@
         {{ $categories = $categories | append (printf `<a href="%s">%s</a>` .Permalink .LinkTitle) }}
     {{ end }}
 
-    <div class="page-metadata-section categories" aria-label="{{ i18n "aria_post_meta_categories" }}">
+    <div class="page-metadata-section categories" data-pagefind-meta="categories" aria-label="{{ i18n "aria_post_meta_categories" }}">
         {{ partial "icon.html" "folder" }}
         {{ delimit $categories ", " | safeHTML }}
     </div>
diff --git a/layouts/_partials/page-metadata/item/series.html b/layouts/_partials/page-metadata/item/series.html
index 1ea5806..ac04bdb 100644
--- a/layouts/_partials/page-metadata/item/series.html
+++ b/layouts/_partials/page-metadata/item/series.html
@@ -4,7 +4,7 @@
         {{ $series = $series | append (printf `<a href="%s">%s</a>` .Permalink .LinkTitle) }}
     {{ end }}
 
-    <div class="page-metadata-section series" aria-label="{{ i18n "aria_post_meta_series" }}">
+    <div class="page-metadata-section series" data-pagefind-meta="series" aria-label="{{ i18n "aria_post_meta_series" }}">
         {{ partial "icon.html" "files" }}
         {{ delimit $series ", " | safeHTML }}
     </div>
diff --git a/layouts/_partials/page-metadata/item/tags.html b/layouts/_partials/page-metadata/item/tags.html
index 054f0f8..0a340f1 100644
--- a/layouts/_partials/page-metadata/item/tags.html
+++ b/layouts/_partials/page-metadata/item/tags.html
@@ -4,7 +4,7 @@
         {{ $tags = $tags | append (printf `<a href="%s">%s</a>` .Permalink .LinkTitle) }}
     {{ end }}
 
-    <div class="page-metadata-section tags" aria-label="{{ i18n "aria_post_meta_tags" }}">
+    <div class="page-metadata-section tags" data-pagefind-meta="tags" aria-label="{{ i18n "aria_post_meta_tags" }}">
         {{ partial "icon.html" "tag" }}
         {{ delimit $tags ", " | safeHTML }}
     </div>
diff --git a/layouts/baseof.html b/layouts/baseof.html
index 6a43a7a..0da4e8d 100644
--- a/layouts/baseof.html
+++ b/layouts/baseof.html
@@ -19,7 +19,7 @@
                 {{ partial "breadcrumb.html" . }}
             {{ end }}
 
-            <main id="main-content" data-pagefind-body>
+            <main id="main-content" {{ if .IsPage }}data-pagefind-body{{ end }}>
                 {{ block "main" . }}
                     THIS TEXT SHOULD NOT SHOW. YUZSIQGHE (that string is so I can grep for it)
                 {{ end }}