diff --git a/layouts/taxonomy/list.html b/layouts/taxonomy/list.html
index 22689d7..8fb772e 100644
--- a/layouts/taxonomy/list.html
+++ b/layouts/taxonomy/list.html
@@ -3,14 +3,16 @@
   {{ if eq (len $p) 1 }}
     <div class="coretitle"><span class="supt">{{ index $p 0 }}⁄</span>All</div>
     {{ range $taxonomyname, $taxonomy := .Site.Taxonomies }}
-      {{ range $key, $value := $taxonomy }}
-        <span> <a href="/{{ index $p 0 }}/{{ $key }}/{{ if eq hugo.Environment "offline" }}index.html{{ end }}">{{ $key }}</a>({{ len (index $.Site.Taxonomies.keywords $key) }})</span>
+      {{ if eq (index $p 0) $taxonomyname }}
+        {{ range $key, $value := $taxonomy }}
+          <span> <a href="/{{ index $p 0 }}/{{ $key }}/{{ if eq hugo.Environment "offline" }}index.html{{ end }}">{{ $key }}</a>({{ len (index (index $.Site.Taxonomies $taxonomyname) $key) }})</span>
+        {{ end }}
       {{ end }}
     {{ end }}
   {{ else }}
     <div class="coretitle"><span class="supt">{{ index $p 0 }}⁄</span>{{ index $p 1 }}</div>
     {{ range .Pages  }}
-        <li><a href="{{ .RelPermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}">{{ .Title }}</a></li>
-    {{  end }}
+      <li><a href="{{ .RelPermalink }}{{ if eq hugo.Environment "offline" }}index.html{{ end }}">{{ .Title }}</a></li>
+    {{ end }}
   {{ end }}
 {{ end }}