diff --git a/layouts/partials/page_metadata.html b/layouts/partials/page_metadata.html
index bd037062..a53915a9 100644
--- a/layouts/partials/page_metadata.html
+++ b/layouts/partials/page_metadata.html
@@ -55,19 +55,17 @@
   <a href="{{ $page.RelPermalink }}#disqus_thread"><!-- Count will be inserted here --></a>
   {{ end}}
 
-  {{ if $page.Params.categories }}
-  {{ $categoriesLen := len $page.Params.categories }}
-  {{ if gt $categoriesLen 0 }}
+  {{ $taxonomy := "categories" }}
+  {{ with $page.Param $taxonomy }}
   <span class="middot-divider"></span>
   <span class="article-categories">
     <i class="fas fa-folder"></i>
-    {{ range $k, $v := $page.Params.categories }}
-    <a href="{{ (site.GetPage (printf "categories/%s" .)).RelPermalink }}">{{ . }}</a>
-    {{- if lt $k (sub $categoriesLen 1) -}}, {{ end }}
-    {{ end }}
+    {{ range $index, $value := . -}}
+      {{- if gt $index 0 }}, {{ end -}}
+      <a href="{{ (site.GetPage (printf "/%s/%s" $taxonomy (. | urlize))).RelPermalink }}">{{ . }}</a>
+    {{- end -}}
   </span>
   {{ end }}
-  {{ end }}
 
   {{ if $share }}
     {{ partial "share.html" $ }}
diff --git a/layouts/partials/tags.html b/layouts/partials/tags.html
index 0a59d9e5..721c1197 100644
--- a/layouts/partials/tags.html
+++ b/layouts/partials/tags.html
@@ -1,10 +1,8 @@
-{{ if isset $.Params "tags" }}
-{{ $tagsLen := len $.Params.tags }}
-{{ if gt $tagsLen 0 }}
+{{ $taxonomy := "tags" }}
+{{ with .Param $taxonomy }}
 <div class="article-tags">
-  {{ range $k, $v := $.Params.tags }}
-  <a class="badge badge-light" href="{{ (site.GetPage (printf "tags/%s" .)).RelPermalink }}">{{ . }}</a>
+  {{ range $index, $value := . }}
+  <a class="badge badge-light" href="{{ (site.GetPage (printf "/%s/%s" $taxonomy (. | urlize))).RelPermalink }}">{{ . }}</a>
   {{ end }}
 </div>
 {{ end }}
-{{ end }}