diff --git a/layouts/partials/article/components/details.html b/layouts/partials/article/components/details.html
index fd053a8..016e9d6 100644
--- a/layouts/partials/article/components/details.html
+++ b/layouts/partials/article/components/details.html
@@ -1,16 +1,18 @@
 {{ $image := partialCached "helper/image" (dict "Context" . "Type" "article") .RelPermalink "article" }}
-{{ $context := . }}
+{{- $context := . -}}
+{{- $categories := .Params.categories -}}
 <div class="article-details">
-    {{ with $categories := .Params.categories }}
+    {{ if $categories }}
     <header class="article-category">
-        {{ range $categories }}
+        {{ range $category := $categories }}
+            {{ $term := $.Site.GetPage (printf "/categories/%s" $category) }}
             {{ if and $image.exists $image.resource }}
                 {{- $imageRaw := $image.resource | resources.Fingerprint "md5"  -}}
                 {{- $20x := $imageRaw.Fill "20x20 smart"  -}}
-                <a href="{{ printf `categories/%s` (. | urlize) | relLangURL }}" class="color-tag"
-                    data-image="{{ $20x.RelPermalink }}" data-key="{{ $context.Slug }}" data-hash="{{ $imageRaw.Data.Integrity }}">{{ . | humanize }}</a>
+                <a href="{{ $term.Permalink }}" class="color-tag"
+                    data-image="{{ $20x.RelPermalink }}" data-key="{{ $context.Slug }}" data-hash="{{ $imageRaw.Data.Integrity }}">{{ $term.Title | humanize }}</a>
             {{ else }}
-                <a href="{{ printf `categories/%s` (. | urlize) | relLangURL }}">{{ . | humanize }}</a>
+                <a href="{{ $term.Permalink }}">{{ $term.Title | humanize }}</a>
             {{ end }}
         {{ end }}
     </header>
diff --git a/layouts/partials/article/components/footer.html b/layouts/partials/article/components/footer.html
index 102bc4a..3431c81 100644
--- a/layouts/partials/article/components/footer.html
+++ b/layouts/partials/article/components/footer.html
@@ -1,11 +1,5 @@
 <footer class="article-footer">
-    {{ with $tags := .Params.Tags }}
-    <section class="article-tags">
-        {{ range $tags }}
-        <a href="{{ printf `tags/%s` (. | urlize) | relLangURL }}">{{ . | humanize }}</a>
-        {{ end }}
-    </section>
-    {{ end }}
+    {{ partial "article/components/tags" . }}
 
     {{ if and (.Site.Params.article.license.enabled) (not (eq .Params.license false)) }}
     <section class="article-copyright">
diff --git a/layouts/partials/article/components/tags.html b/layouts/partials/article/components/tags.html
new file mode 100644
index 0000000..73446cd
--- /dev/null
+++ b/layouts/partials/article/components/tags.html
@@ -0,0 +1,10 @@
+{{- $tags := .Params.Tags -}}
+{{ if $tags }}
+    <section class="article-tags">
+        {{ range $tag := $tags }}
+            {{ with $.Site.GetPage (printf "/tags/%s" $tag) }}
+                <a href="{{ .Permalink }}">{{ .Title | humanize }}</a>
+            {{ end }}
+        {{ end }}
+    </section>
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/widget/tag-cloud.html b/layouts/partials/widget/tag-cloud.html
index 1fa8efe..a29b382 100644
--- a/layouts/partials/widget/tag-cloud.html
+++ b/layouts/partials/widget/tag-cloud.html
@@ -8,9 +8,10 @@
 
     <div class="tagCloud-tags">
         {{ range first .Site.Params.widgets.tagCloud.limit $tags }}
-        <a href="{{ printf `tags/%s` (.Term | urlize) | relLangURL }}" class="font_size_{{ .Count }}">
-            {{ .Term | humanize }}
-        </a>
+            {{ $term := $.Site.GetPage (printf "/tags/%s" .Term) }}
+            <a href="{{ $term.Permalink }}" class="font_size_{{ .Count }}">
+                {{ $term.Title | humanize }}
+            </a>
         {{ end }}
     </div>
 </section>
\ No newline at end of file