diff --git a/layouts/partials/article/components/details.html b/layouts/partials/article/components/details.html
index 89d5554..1e7ea18 100644
--- a/layouts/partials/article/components/details.html
+++ b/layouts/partials/article/components/details.html
@@ -1,16 +1,19 @@
-{{ $image := partialCached "helper/image" (dict "Context" .) .RelPermalink }}
-{{ $context := . }}
+{{- $image := partialCached "helper/image" (dict "Context" .) .RelPermalink -}}
+{{- $context := . -}}
+{{- $categories := .Params.categories -}}
 <div class="article-details">
-    {{ with $categories := .Params.categories }}
+    {{ if $categories }}
     <header class="article-category">
-        {{ range $categories }}
-            {{ 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>
-            {{ else }}
-                <a href="{{ printf `categories/%s` (. | urlize) | relLangURL }}">{{ . | humanize }}</a>
+        {{ range $category := $categories }}
+            {{ with $.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="{{ .Permalink }}" class="color-tag"
+                        data-image="{{ $20x.RelPermalink }}" data-key="{{ $context.Slug }}" data-hash="{{ $imageRaw.Data.Integrity }}">{{ .Title | humanize }}</a>
+                {{ else }}
+                    <a href="{{ printf `categories/%s` (. | urlize) | relLangURL }}">{{ .Title | humanize }}</a>
+                {{ end }}
             {{ 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