diff --git a/assets/js/search.js b/assets/js/search.js
index 954153852..9f931c89b 100644
--- a/assets/js/search.js
+++ b/assets/js/search.js
@@ -30,6 +30,9 @@ const initSearch = () => {
       placeholder: placeholderText,
       search_label: searchLabelText,
     },
+    ranking: {
+      termSimilarity: 6.0,
+    },
   });
 
   // Close keyboard when touching search results (mobile only)
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 0174bead4..baddeeec7 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,7 +1,7 @@
 {{ define "main" }}
   <div class="o-list">
     <div>
-      <h1 data-pagefind-meta="title">{{ .Title }}</h1>
+      <h1 data-pagefind-meta="title" data-pagefind-weight="10">{{ .Title }}</h1>
       {{ .Content }}
       {{ range .Pages }}
         {{ partial "teaser.html" (dict "listview" "true" "page" .) }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 9b90f0aba..d7d900c6c 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,15 +1,16 @@
 {{ define "main" }}
   <article
     class="o-single o-single__content-wrapper"
+    data-pagefind-body
     {{- if .Params.pagefind_ignore -}}
       data-pagefind-ignore="all"
     {{- end -}}
   >
     <div class="o-single__header">
-      <h1 data-pagefind-meta="title">{{ .Title }}</h1>
+      <h1 data-pagefind-meta="title" data-pagefind-weight="10">{{ .Title }}</h1>
     </div>
 
-    <div class="o-single__content" data-pagefind-body>
+    <div class="o-single__content">
       {{ .Content }}
     </div>
   </article>
diff --git a/layouts/booking/list.html b/layouts/booking/list.html
index 7743b143e..69450700e 100644
--- a/layouts/booking/list.html
+++ b/layouts/booking/list.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
   <div class="o-list o-list__container">
-    <h1 data-pagefind-meta="title">{{ .Title }}</h1>
+    <h1 data-pagefind-meta="title" data-pagefind-weight="10">{{ .Title }}</h1>
     {{ .Content }}
     <ul aria-labelledby="booking-title">
       {{ range .Pages }}
diff --git a/layouts/country/list.html b/layouts/country/list.html
index 51e30b034..c7030feb8 100644
--- a/layouts/country/list.html
+++ b/layouts/country/list.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
   <article class="o-list o-list__container">
-    <h1 data-pagefind-meta="title">{{ .Title }}</h1>
+    <h1 data-pagefind-meta="title" data-pagefind-weight="10">{{ .Title }}</h1>
     {{ .Content }}
     <div class="o-list__countries">
       <div class="o-list__countries-overview">
diff --git a/layouts/country/single.html b/layouts/country/single.html
index 6003ca531..33134f9f4 100644
--- a/layouts/country/single.html
+++ b/layouts/country/single.html
@@ -9,7 +9,9 @@
         <div class="o-single__content-header">
           <div class="o-single__content-header-title">
             {{ partial "flag" (dict "country" .File.ContentBaseName "pagefind" true) }}
-            <h1 data-pagefind-meta="title">{{ .Title }}</h1>
+            <h1 data-pagefind-meta="title" data-pagefind-weight="10">
+              {{ .Title }}
+            </h1>
           </div>
           {{ partial "updateDate.html" . }}
         </div>
diff --git a/layouts/generalinformation/list.html b/layouts/generalinformation/list.html
index d17bb0752..6fd0e0ade 100644
--- a/layouts/generalinformation/list.html
+++ b/layouts/generalinformation/list.html
@@ -5,7 +5,9 @@
       <div class="o-single__container o-single__highlight">
         <div class="o-single__content-header">
           <div class="o-single__content-header-title">
-            <h1 data-pagefind-meta="title">{{ .Title }}</h1>
+            <h1 data-pagefind-meta="title" data-pagefind-weight="10">
+              {{ .Title }}
+            </h1>
           </div>
           {{ partial "updateDate.html" . }}
         </div>
diff --git a/layouts/news/list.html b/layouts/news/list.html
index c345c143c..f7964b955 100644
--- a/layouts/news/list.html
+++ b/layouts/news/list.html
@@ -1,7 +1,7 @@
 {{ define "main" }}
   <article class="o-list o-list--news">
     <div>
-      <h1 data-pagefind-meta="title">{{ .Title }}</h1>
+      <h1 data-pagefind-meta="title" data-pagefind-weight="10">{{ .Title }}</h1>
       {{ .Content }}
       <div>
         {{ range .Pages }}
diff --git a/layouts/news/single.html b/layouts/news/single.html
index 14a61cb4e..ae53c6147 100644
--- a/layouts/news/single.html
+++ b/layouts/news/single.html
@@ -38,7 +38,9 @@ <h3 id="o-related__title">{{ T "news.further" }}</h3>
       data-pagefind-body
     >
       <div class="o-single__content-header">
-        <h1 data-pagefind-meta="title">{{ .Title }}</h1>
+        <h1 data-pagefind-meta="title" data-pagefind-weight="10">
+          {{ .Title }}
+        </h1>
         {{ partial "updateDate.html" . }}
       </div>
       <div class="o-single__news-image">
diff --git a/layouts/operator/list.html b/layouts/operator/list.html
index 13278453c..74ca9857e 100644
--- a/layouts/operator/list.html
+++ b/layouts/operator/list.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
   <article class="o-list o-list__container">
-    <h1 data-pagefind-meta="title">{{ .Title }}</h1>
+    <h1 data-pagefind-meta="title" data-pagefind-weight="10">{{ .Title }}</h1>
     {{ .Content }}
     <ul class="o-list__list">
       {{ range .Pages }}
diff --git a/layouts/operator/single.html b/layouts/operator/single.html
index 41e8248bf..a7ad62bca 100644
--- a/layouts/operator/single.html
+++ b/layouts/operator/single.html
@@ -6,7 +6,9 @@
         <div class="o-single__content-header">
           <div class="o-single__content-header-title">
             {{ partial "operator-logo" (dict "operator" .File.ContentBaseName "pagefind" true) }}
-            <h1 data-pagefind-meta="title">{{ .Title }}</h1>
+            <h1 data-pagefind-meta="title" data-pagefind-weight="10">
+              {{ .Title }}
+            </h1>
           </div>
           {{ partial "updateDate.html" . }}
         </div>