diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 27b9b674..7a7edf58 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -5,7 +5,7 @@
     <div class="row">
       <div class="col-lg-8">
         <div class="row">
-          {{ $paginator := .Paginate ( where .Data.Pages "Type" "post") }}
+          {{ $paginator := .Paginate (where .Data.Pages "Type" "post") }}
           {{ range $paginator.Pages }}
           <div class="col-md-6 d-flex align-items-stretch">
             {{ partial "card-article" . }}
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
index 556e24e1..10bf4474 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@@ -8,7 +8,7 @@
         {{ if eq $.Data.Plural "tags" }}
           <a href="{{ `tags/` | relURL }}{{ $name | urlize | lower }}">{{ $name }}</a>
         {{ else if eq $.Data.Plural "categories" }}
-          <a href="{{ `categories/` | relURL }}{{ $name | urlize | lower }}">{{ if (index $transliterations $name) }}{{ index $transliterations $name }}{{ else }}{{ $name | title }}{{end}}</a>
+          <a href="{{ `categories/` | relURL }}{{ $name | urlize | lower }}">{{ with (index $transliterations $name) }}{{ . }}{{ else }}{{ $name | title }}{{end}}</a>
         {{ end }}
 		  {{ end }}
 	  </div>
diff --git a/layouts/author/single.html b/layouts/author/single.html
index e4b64e68..2d9e0962 100644
--- a/layouts/author/single.html
+++ b/layouts/author/single.html
@@ -14,7 +14,7 @@
 		  {{ .Content }}
 		  <hr>
 		  {{ with .Params.email }}
-		      <a href="mailto:{{ . }}">{{ partial "icons/icon" (dict "vendor" "mdi" "name" "at") }}</a>
+		    <a href="mailto:{{ . }}">{{ partial "icons/icon" (dict "vendor" "mdi" "name" "at") }}</a>
 		  {{ end }}
 		</div>
   </div>
diff --git a/layouts/begabte/single.html b/layouts/begabte/single.html
index d81be7c8..58a09f61 100644
--- a/layouts/begabte/single.html
+++ b/layouts/begabte/single.html
@@ -6,7 +6,7 @@
   <div class="container">
     <h2 class="mb-4">Weitere Begabtenförderungsangebote</h2>
     <div class="row" data-pagefind-ignore="all">
-    {{ range partial "related" . }}
+    {{ range partial "data/related" . }}
       {{ partial "card-btn" . }}
     {{ end }}
     </div>
diff --git a/layouts/ganztagsangebote/single.html b/layouts/ganztagsangebote/single.html
index 1c38ffab..20d92ec4 100644
--- a/layouts/ganztagsangebote/single.html
+++ b/layouts/ganztagsangebote/single.html
@@ -22,7 +22,7 @@
   <div class="container">
     <h2 class="mb-4">Andere Arbeitsgemeinschaften</h2>
     <div class="row">
-      {{ range partial "related" . }}
+      {{ range partial "data/related" . }}
         <div class="col-lg-4 col-sm-6">
           {{ partial "ganztag" . }}
         </div>
diff --git a/layouts/partials/related.html b/layouts/partials/data/related.html
similarity index 100%
rename from layouts/partials/related.html
rename to layouts/partials/data/related.html
diff --git a/layouts/wettbewerbe/single.html b/layouts/wettbewerbe/single.html
index 99dd44af..1643fb31 100644
--- a/layouts/wettbewerbe/single.html
+++ b/layouts/wettbewerbe/single.html
@@ -6,7 +6,7 @@
   <div class="container">
     <h2 class="mb-4">Weitere Wettbewerbe</h2>
     <div class="row" data-pagefind-ignore="all">
-      {{ range partial "related" . }}
+      {{ range partial "data/related" . }}
       <div class="col-lg-4 col-sm-6">
         {{ partial "card-category" . }}
       </div>