diff --git a/themes/hugo-sustain/layouts/_default/list.html b/themes/hugo-sustain/layouts/_default/list.html
index 4ff2954..cfe79ad 100644
--- a/themes/hugo-sustain/layouts/_default/list.html
+++ b/themes/hugo-sustain/layouts/_default/list.html
@@ -11,7 +11,7 @@
     <div class="container archive">
       <!-- Page Title -->
       {{- if $selection }}
-      <h1>{{ (printf "Everything from %s \"%s\"" (.Data.Singular | humanize) (humanize .Title)) | markdownify }}</h1>
+      <h1>{{ (printf "Everything from %s \"%s\"" (.Data.Singular | humanize) .Title) | markdownify }}</h1>
       {{- else }}
       <h1>{{ .Title }}</h1>
       {{- end }}
@@ -53,11 +53,10 @@
           </div>
           <div class="col-xs-9 col-md-10">
             <a class="label label-success {{if not $selection}}active{{end}}" href="/blog">All</a>
-            {{ range $name, $taxonomy := .Site.Taxonomies.tags }}
-              <a class="label label-success {{if eq $name $.Title}}active{{end}}" href="{{ "/tags/" | relLangURL }}{{ $name | urlize }}">
-                {{- humanize $name -}}
-              </a>
-            {{- end -}}
+            {{ $tags := site.GetPage "/tags" }}
+            {{ range sort $tags.Pages "Title" "asc"}}
+              <a href="{{ .RelPermalink }}" class="label label-success {{if eq .LinkTitle $.Title}}active{{end}}">{{ .LinkTitle }}</a>
+            {{ end }}
           </div>
         </div>
         <div class="row vertical-align">