diff --git a/themes/buha/layouts/_default/rss.xml b/themes/buha/layouts/_default/rss.xml
index cac75ad..394124c 100644
--- a/themes/buha/layouts/_default/rss.xml
+++ b/themes/buha/layouts/_default/rss.xml
@@ -6,80 +6,86 @@
 {{- if .IsHome -}}
   {{- $desc = printf "Aktuelle Informationen vom %s" $title -}}
   {{- $title = printf "%s: %s" $title $i18n_section -}}
-{{ else if in .Site.Params.mainMenu .Section }}
+{{- else if in .Site.Params.mainMenu .Section -}}
   {{- $desc = printf "Aktuelle Informationen vom %s" .Site.Title -}}
-  {{ $i18n_section = i18n .Section }}
+  {{- $i18n_section = i18n .Section -}}
   {{- $title = printf "%s: %s" .Site.Title $i18n_section -}}
 {{- end -}}
 
 
 
-{{- $pages := where (where site.RegularPages "Permalink" "!=" .Permalink) "Type" "in" .Site.Params.searchSections -}}
+{{- $pages := where .Site.RegularPages "Section" "in" .Site.Params.searchSections -}}
 {{- if eq .Section "events" -}}
   {{- $pages = where $pages ".Params.when" "ne" nil -}}
+{{- else if eq .Section "about" -}}
+  {{- $pages = where $pages ".Params.about" "ne" nil -}}
+{{- else if eq .Section "featured" -}}
+  {{- $pages = where $pages ".Params.featured" "ne" nil -}}
+{{- else if eq .Section "tags" -}}
+  {{- $pages = where $pages ".Params.tags" "ne" nil -}}
 {{- end -}}
 
-{{- printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML }}
+{{- printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML -}}
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
-    <title>{{ .Site.Title }}</title>
-    <link>{{ .Permalink }}</link>
+    <title>{{- .Site.Title -}}</title>
+    <link>{{- .Permalink -}}</link>
     <description>{{- $desc -}}</description>
-    <generator>Hugo -- gohugo.io</generator>{{ with .Site.LanguageCode }}
-    <language>{{.}}</language>{{end}}{{ with .Site.Author.email }}
-    <managingEditor>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</managingEditor>{{end}}{{ with .Site.Author.email }}
-    <webMaster>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</webMaster>{{end}}{{ with .Site.Copyright }}
-    <copyright>{{.}}</copyright>{{end}}{{ if not .Date.IsZero }}
-    <lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}
+    <generator>Hugo -- gohugo.io</generator>{{- with .Site.LanguageCode -}}
+    <language>{{.}}</language>{{end}}{{- with .Site.Author.email -}}
+    <managingEditor>{{.}}{{- with $.Site.Author.name -}} ({{.}}){{end}}</managingEditor>{{end}}{{- with .Site.Author.email -}}
+    <webMaster>{{.}}{{- with $.Site.Author.name -}} ({{.}}){{end}}</webMaster>{{end}}{{- with .Site.Copyright -}}
+    <copyright>{{.}}</copyright>{{end}}{{- if not .Date.IsZero -}}
+    <lastBuildDate>{{- .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML -}}</lastBuildDate>{{- end -}}
     {{- with .OutputFormats.Get "RSS" -}}
-    {{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}
+    {{- printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML -}}
     {{- end -}}
-    {{ range $pages }}
-    {{ if or (eq .Lastmod .Date) (gt .Lastmod (.Date.AddDate 0 0 -1)) }}
-    {{ $when := .Params.when }}
-    {{ $about := .Params.about }}
-    {{ $covid := .Params.covid }} 
-    {{ $contact := .Params.contact }} 
-    {{ $price := .Params.price }} 
-    {{ $featured := .Params.featured }} 
-    {{ $categories := slice }}
-    {{ range .Params.categories }}
-      {{ $categories = $categories | append . }}
-    {{ end }}
-    {{ $events := slice }}
-    {{ range .Params.events }}
-      {{ $events = $events | append . }}
-    {{ end }}
-    {{ $tags := slice }}
-    {{ range .Params.tags }}
-      {{ $tags = $tags | append . }}
-    {{ end }}
-    {{ $images := slice }}
-    {{ $hash := slice $when $about $categories $events $covid $contact $price $featured $tags .Date .Lastmod .Title .Content }}
-    {{ $hash = delimit $hash ", " }}
-    {{ $hash = md5 $hash }}
+    {{- range $pages -}}
+    {{- if or (eq .Lastmod .Date) (gt .Lastmod (.Date.AddDate 0 0 -1)) -}}
+    {{- $when := .Params.when -}}
+    {{- $about := .Params.about -}}
+    {{- $covid := .Params.covid -}} 
+    {{- $contact := .Params.contact -}} 
+    {{- $price := .Params.price -}} 
+    {{- $featured := .Params.featured -}} 
+    {{- $categories := slice -}}
+    {{- range .Params.categories -}}
+      {{- $categories = $categories | append . -}}
+    {{- end -}}
+    {{- $events := slice -}}
+    {{- range .Params.events -}}
+      {{- $events = $events | append . -}}
+    {{- end -}}
+    {{- $tags := slice -}}
+    {{- range .Params.tags -}}
+      {{- $tags = $tags | append . -}}
+    {{- end -}}
+    {{- $images := slice -}}
+    {{- $hash := slice $when $about $categories $events $covid $contact $price $featured $tags .Date .Lastmod .Title .Content -}}
+    {{- $hash = delimit $hash ", " -}}
+    {{- $hash = md5 $hash -}}
     
     <item>
       <title>
-        {{ if .Params.events }}
-            {{ index .Params.events 0 }}:
-        {{ else if .Params.recurrent }}
-            {{ if i18n "recurrent"}}
-                {{ i18n "recurrent"}}:
-            {{ else }}
-                {{ "Recurrent"}}:
-            {{ end }}
-        {{ else if .Params.categories }}
-            {{ if in .Params.categories "Buha" }}
+        {{- if .Params.events -}}
+            {{- index .Params.events 0 -}}:
+        {{- else if .Params.recurrent -}}
+            {{- if i18n "recurrent"}}
+                {{- i18n "recurrent"}}:
+            {{- else -}}
+                {{- "Recurrent"}}:
+            {{- end -}}
+        {{- else if .Params.categories -}}
+            {{- if in .Params.categories "Buha" -}}
                 In eigener Sache:
-            {{ end }}
-        {{ end }}
-        {{ .Title }}
+            {{- end -}}
+        {{- end -}}
+        {{- .Title -}}
       </title>
-      <link>{{ .Permalink }}</link>
-      <pubDate>{{ .Lastmod.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
-      {{ with .Site.Author.email }}<author>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</author>{{end}}
-      <guid>{{ .Permalink }}-{{ $hash }}</guid>
+      <link>{{- .Permalink -}}</link>
+      <pubDate>{{- .Lastmod.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML -}}</pubDate>
+      {{- with .Site.Author.email -}}<author>{{.}}{{- with $.Site.Author.name -}} ({{.}}){{end}}</author>{{end}}
+      <guid>{{- .Permalink -}}-{{- $hash -}}</guid>
       <description>
         {{- $c := .Content -}}
         
@@ -116,7 +122,7 @@
       </description>
 
     </item>
-    {{ end }}
+    {{- end -}}
   </channel>
 </rss>
 {{- end -}}