diff --git a/themes/buha/layouts/_default/rss.xml b/themes/buha/layouts/_default/rss.xml
index 3c01a821..c24db9e5 100644
--- a/themes/buha/layouts/_default/rss.xml
+++ b/themes/buha/layouts/_default/rss.xml
@@ -30,9 +30,9 @@
     {{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}
     {{- end -}}
     {{ range where $pages "Type" "in" .Site.Params.searchSections }}
-    {{ $when := "" }}
-    {{ if and (ne .Params.when "") (ne .Params.when nil) }}
-      {{ $when = .Params.when }}
+    {{ $when := .Params.when }}
+    {{ with $when }}
+      {{ $when }}
     {{ end }}
     <item>
       <title>{{ .Title }}</title>
@@ -41,9 +41,9 @@
       {{ with .Site.Author.email }}<author>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</author>{{end}}
       <guid>{{ .Permalink }}-{{ .Lastmod }}</guid>
       <description>
-        {{ if and (ne $when "") (ne $when nil) }}{{ printf "<![CDATA[<p>%s</p>]]>" $when | safeHTML }}{{ end }}
+        {{ if $when }}{{ printf "<![CDATA[<p><b>%s</b></p>]]>" $when | safeHTML }}{{ end }}
         
-        {{ printf "<![CDATA[%s]]>" .Content | safeHTML }}
+        {{ printf "<![CDATA[%s]]>" .Content | plainify }}
         {{ $img := index (.Resources.ByType "image") 0 }}
         {{ with $img }}
         {{ $img := .Resize "640x" }}