diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
index de03410..093bb53 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@@ -7,13 +7,13 @@
   </article>
   <div class="mw8 center">
     <section class="ph4">
-      {{ range $key, $value := .Data.Terms }}
+      {{ range $term := .Data.Pages }}
         <h2 class="f1">
-          <a href="{{ "/" | relLangURL }}{{ $.Data.Plural | urlize }}/{{ $key | urlize }}" class="link blue hover-black">
-            {{ $.Data.Singular | humanize }}: {{ $key }}
+          <a href="{{ $term.RelPermalink }}" class="link blue hover-black">
+            {{ $.Data.Singular | humanize }}: {{ $term.LinkTitle }}
           </a>
         </h2>
-        {{ range $value.Pages }}
+        {{ range $term.Pages }}
           {{ .Render "summary" }}
         {{ end }}
       {{ end }}
diff --git a/layouts/partials/tags.html b/layouts/partials/tags.html
index 976a9a2..fe1a94a 100644
--- a/layouts/partials/tags.html
+++ b/layouts/partials/tags.html
@@ -1,8 +1,8 @@
 <ul class="pa0">
-  {{ range .Params.tags }}
+  {{ range .GetTerms "tags" }}
    <li class="list di">
-     <a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}" class="link f5 grow no-underline br-pill ba ph3 pv2 mb2 dib black sans-serif">
-       {{- . -}}
+     <a href="{{ .RelPermalink }}" class="link f5 grow no-underline br-pill ba ph3 pv2 mb2 dib black sans-serif">
+       {{- .LinkTitle -}}
      </a>
    </li>
   {{ end }}