diff --git a/layouts/partials/docs/post-meta.html b/layouts/partials/docs/post-meta.html
index a129944..41221c7 100644
--- a/layouts/partials/docs/post-meta.html
+++ b/layouts/partials/docs/post-meta.html
@@ -7,12 +7,13 @@
 
 {{ range $term, $_ := .Site.Taxonomies }}
   {{ with $list := index $.Params $term }}
+  <div>
     {{ range $n, $single := $list }}{{ if $n }}, {{ end }}
-      {{ with $.Site.GetPage (printf "/%s/%s" $term $single) }}
-        <a href="{{ .RelPermalink }}">{{ $single }}</a>
+      {{ with $.Site.GetPage (printf "/%s/%s" $term $single | urlize) }}
+        <a href="{{ .RelPermalink }}">{{ .Title }}</a>
       {{- end }}
     {{- end }}
-    <br />
+  </div>
   {{ end }}
 {{ end }}
 
diff --git a/layouts/partials/docs/taxonomy.html b/layouts/partials/docs/taxonomy.html
index f2c00d5..db82e4c 100644
--- a/layouts/partials/docs/taxonomy.html
+++ b/layouts/partials/docs/taxonomy.html
@@ -2,7 +2,7 @@
 <nav>
   <ul>
   {{ range $term, $_ := .Site.Taxonomies }}
-  {{ with $.Site.GetPage (printf "/%s" $term) }}
+    {{ with $.Site.GetPage (printf "/%s" $term | urlize) }}
     <li class="book-section-flat">
       <strong>{{ .Title | title }}</strong>
       <ul>
@@ -13,7 +13,7 @@
       {{ end }}
       </ul>
     </li>
-  {{ end }}
+    {{ end }}
   {{ end }}
   </ul>
 </nav>