diff --git a/templates/blogroll.gohtml b/templates/blogroll.gohtml
index 6da7a89..28d8e82 100644
--- a/templates/blogroll.gohtml
+++ b/templates/blogroll.gohtml
@@ -9,10 +9,14 @@
     <p><a href="{{ blogrelative .Blog .Data.Download }}" class="button" download>{{ string .Blog.Lang "download" }}</a></p>
     {{ $lang := .Blog.Lang }}
     {{ range .Data.Outlines }}
-        <h2>{{ with .Title }}{{ . }}{{ else }}{{ with .Text }}{{ . }}{{ end }}{{ end }}</h2>
+        {{ $title := .Title }}
+        {{ if not $title }}{{ $title = .Text }}{{ end }}
+        <h2 id="{{ urlize $title }}">{{ $title }}</h2>
         <ul>
             {{ range .Outlines }}
-                <li><a href="{{ urlToString .HTMLURL }}" target="_blank">{{ with .Title }}{{ . }}{{ else }}{{ with .Text }}{{ . }}{{ end }}{{ end }}</a> (<a href="{{ urlToString .XMLURL }}" target="_blank">{{ string $lang "feed" }}</a>)</li>
+                {{ $ct := .Title }}
+                {{ if not $ct }}{{ $ct = .Text }}{{ end }}
+                <li><a href="{{ urlToString .HTMLURL }}" target="_blank">{{ $ct }}</a> (<a href="{{ urlToString .XMLURL }}" target="_blank">{{ string $lang "feed" }}</a>)</li>
             {{ end }}
         </ul>
     {{ end }}