diff --git a/web/content/docs/benchmarks/hydro-component/contracer/index.md b/web/content/docs/benchmarks/hydro-component/contracer/index.md
index 6c175213010..6ede4066649 100644
--- a/web/content/docs/benchmarks/hydro-component/contracer/index.md
+++ b/web/content/docs/benchmarks/hydro-component/contracer/index.md
@@ -20,7 +20,7 @@ Hydraulic water influx was 0.768 $\textrm{m}^3~\textrm{d}^{-1}$ at the left side
 The tracer (40.26 g of $\textrm{Br}^-$) was diluted in 12 L of waste water and added as a single impulse event at $t=0$.
 Note, that only 89\% of the tracer was recovered at the outlet.
 
-![Top: Schematic representation of the experiment. Middle and bottom: Simulated domain and input parameters in 1D and 2D, respectively. Modified with permission from Boog et al. (2019).](ConTracer_domain.png)
+![Top: Schematic representation of the experiment. Middle and bottom: Simulated domain and input parameters in 1D and 2D, respectively. Modified with permission from Boog et al. (2019).](./ConTracer_domain.png)
 
 ## Problem description (1D)
 
diff --git a/web/layouts/docs/gallery.html b/web/layouts/docs/gallery.html
index f070adb5574..daaad31db49 100644
--- a/web/layouts/docs/gallery.html
+++ b/web/layouts/docs/gallery.html
@@ -6,20 +6,21 @@
 
   <div class="bg-white">
     {{ if isset .Params "coupling" }}
-    <img class="h-12 md:h-16 lg:h-20 float-right" src="/images/coupling-icons/{{.Params.coupling}}-tet.svg" alt="">
+    <img class="h-12 md:h-16 lg:h-20 float-right" data-pagefind-meta="image[src]"
+      src="/images/coupling-icons/{{.Params.coupling}}-tet.svg" alt="">
     {{ end }}
 
     {{ if .Page.Params.breadcrumbs }}
-      {{ partial "docs/breadcrumbs.html" . }}
+    {{ partial "docs/breadcrumbs.html" . }}
     {{ end }}
 
     <div class="mx-auto py-2 px-4 max-w-7xl sm:px-6 lg:px-8 lg:py-4">
       <div class="space-y-8">
         <div class="space-y-5 sm:space-y-4 md:max-w-xl lg:max-w-3xl xl:max-w-none">
 
-          <h2 class="text-3xl font-extrabold sm:text-4xl mb-8">
+          <h1 class="text-3xl font-extrabold sm:text-4xl mb-8">
             {{ .Title }}
-          </h2>
+          </h1>
           <div class="clear-both"></div>
           <div class="prose min-w-full">
             {{ .Content }}
diff --git a/web/layouts/docs/single.html b/web/layouts/docs/single.html
index 8112e65e26c..9a033327190 100644
--- a/web/layouts/docs/single.html
+++ b/web/layouts/docs/single.html
@@ -28,7 +28,7 @@
     {{ end }}
 
     <div class="mx-auto py-2 px-4 max-w-7xl sm:px-6 lg:px-8 lg:py-4">
-      <h2 class="text-3xl font-extrabold sm:text-4xl mb-8">{{ .Title }}</h2>
+      <h1 class="text-3xl font-extrabold sm:text-4xl mb-8">{{ .Title }}</h1>
       {{ if $baseSubsection.Params.os_selector }}
       <div class="flex justify-center">
         <div class="invisible mb-8 bg-gray-200 shadow rounded-lg px-2 py-1 w-auto" id="os-selector">
diff --git a/web/layouts/partials/footer-nav.html b/web/layouts/partials/footer-nav.html
index 68ade5de78d..9451a6b97da 100644
--- a/web/layouts/partials/footer-nav.html
+++ b/web/layouts/partials/footer-nav.html
@@ -3,7 +3,7 @@
 {{ $segments := split .RelPermalink "/" }}
 {{ $subsection := index $segments 2 }}
 
-<div class="flex text-sm mb-4">
+<div class="flex text-sm mb-4" data-pagefind-ignore>
   <div class="w-1/2">
     {{ if .NextInSection }}
     {{ $nextSubsection := index (split .NextInSection.RelPermalink "/") 2 }}
@@ -25,7 +25,7 @@
       <a href="{{ .PrevInSection.Permalink }}" title="{{ .PrevInSection.Permalink }}">
         <div class="mb-1">Next <i class="far fa-arrow-right"></i></div>
         <div class="italic">
-          {{ .PrevInSection.Title   }}
+          {{ .PrevInSection.Title }}
         </div>
       </a>
     </div>
diff --git a/web/layouts/partials/global-footer-nav.html b/web/layouts/partials/global-footer-nav.html
index f78974d7c28..bc207b2502d 100644
--- a/web/layouts/partials/global-footer-nav.html
+++ b/web/layouts/partials/global-footer-nav.html
@@ -1,16 +1,17 @@
-<footer class="text-gray-700 body-font">
+<footer class="text-gray-700 body-font" data-pagefind-ignore="all">
   <div class="px-5 py-8 mx-auto flex items-center sm:flex-row flex-col">
-    <p class="text-sm text-gray-500 sm:ml-4 sm:pl-4 sm:border-gray-200 sm:py-2 sm:mt-0 mt-4 mb-0">© {{ dateFormat "2006" now }}
+    <p class="text-sm text-gray-500 sm:ml-4 sm:pl-4 sm:border-gray-200 sm:py-2 sm:mt-0 mt-4 mb-0">© {{ dateFormat "2006"
+      now }}
       OpenGeoSys Community, <a href="/imprint">Privacy policy / Legal statements / Impressum</a></p>
     <span class="inline-flex sm:ml-auto sm:mt-0 mt-4 justify-center sm:justify-start">
 
       <a class="ml-3" rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">
         <img alt="Creative Commons License" style="border-width:0"
-          src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png" />
+          src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png" data-pagefind-ignore="all" />
       </a>
       <a class="ml-3" href="https://www.netlify.com">
         <img style="height: 31px;" src="https://www.netlify.com/img/global/badges/netlify-dark.svg"
-          alt="Deploys by Netlify" />
+          alt="Deploys by Netlify" data-pagefind-ignore="all" />
       </a>
     </span>
   </div>
diff --git a/web/layouts/partials/page-info.html b/web/layouts/partials/page-info.html
index 739a7d45d95..f2165369d3c 100644
--- a/web/layouts/partials/page-info.html
+++ b/web/layouts/partials/page-info.html
@@ -1,6 +1,6 @@
 {{ $job_url := os.Getenv "CI_JOB_URL" }}
 {{ $job_id := os.Getenv "CI_JOB_ID" }}
-<div class="mt-20 text-sm text-gray-700 prose prose-sm max-w-none">
+<div class="mt-20 text-sm text-gray-700 prose prose-sm max-w-none" data-pagefind-ignore>
     <p>This article was written by {{ .Params.Author }}. If you are missing something or you find an error please <a href="mailto:info@opengeosys.org">let us know</a>.<br>
         Generated with <a href="https://gohugo.io">Hugo</a> {{ hugo.Version }}
         {{ if $job_url }}
diff --git a/web/layouts/releases/single.html b/web/layouts/releases/single.html
index 600606e13f9..6209f7e440c 100644
--- a/web/layouts/releases/single.html
+++ b/web/layouts/releases/single.html
@@ -1,6 +1,6 @@
 {{ define "main" }}
 <div class="prose prose-sm lg:prose max-w-none lg:max-w-none">
-  <h1>{{ .Title }} </h1>
+  <h1 data-pagefind-meta="image:/images/OGS-Logo.png">{{ .Title }} </h1>
   {{ partial "releases/single.html" . }}
 </div>
 {{ end }}
diff --git a/web/static/images/OGS-Logo.png b/web/static/images/OGS-Logo.png
new file mode 100644
index 00000000000..7185dc0464c
Binary files /dev/null and b/web/static/images/OGS-Logo.png differ