diff --git a/assets/css/bobastyle.css b/assets/css/bobastyle.css
index 01e3b97..faa59d7 100644
--- a/assets/css/bobastyle.css
+++ b/assets/css/bobastyle.css
@@ -506,6 +506,14 @@ footer p {
   margin-top: 10px;
 }
 
+:is(
+  .page-metadata-section:is(.categories, .tags, .series),
+  .page-metadata-item.authors
+) > a:not(:last-child):after {
+  color: var(--text-0);
+  content: ",";
+}
+
 .post-media {
   margin-top: 15px;
 }
diff --git a/layouts/_partials/page-metadata/item/authors.html b/layouts/_partials/page-metadata/item/authors.html
index 1a2d21a..05e4d52 100644
--- a/layouts/_partials/page-metadata/item/authors.html
+++ b/layouts/_partials/page-metadata/item/authors.html
@@ -1,16 +1,9 @@
-{{ with .Params.authors }}
-    <span class="page-metadata-item" data-pagefind-meta="authors" aria-label="{{ i18n "aria_post_meta_authors" }}">
+{{ with .GetTerms "authors" }}
+    <span class="page-metadata-item authors" aria-label="{{ i18n "aria_post_meta_authors" }}">
         {{ partial "icon.html" "user-circle" }}
 
-        {{ if index $.Site.Taxonomies "authors" }}
-            {{ $authors := slice }}
-            {{ range . }}
-                {{ $url := (printf "authors/%s" (. | anchorize)) | absLangURL }}
-                {{ $authors = $authors | append (printf `<a href="%s">%s</a>` $url .) }}
-            {{ end }}
-            {{ delimit $authors ", " | safeHTML }}
-        {{ else }}
-            {{ delimit . ", " }}
+        {{ range . }}
+            <a href="{{ .Permalink }}" data-pagefind-filter="author">{{ .LinkTitle }}</a>
         {{ end }}
     </span>
 {{ end }}
diff --git a/layouts/_partials/page-metadata/item/categories.html b/layouts/_partials/page-metadata/item/categories.html
index d1f35dc..42c57d7 100644
--- a/layouts/_partials/page-metadata/item/categories.html
+++ b/layouts/_partials/page-metadata/item/categories.html
@@ -4,8 +4,10 @@
         {{ $categories = $categories | append (printf `<a href="%s">%s</a>` .Permalink .LinkTitle) }}
     {{ end }}
 
-    <div class="page-metadata-section categories" data-pagefind-meta="categories" aria-label="{{ i18n "aria_post_meta_categories" }}">
+    <div class="page-metadata-section categories" aria-label="{{ i18n "aria_post_meta_categories" }}">
         {{ partial "icon.html" "folder" }}
-        {{ delimit $categories ", " | safeHTML }}
+        {{ range . }}
+            <a href="{{ .Permalink }}" data-pagefind-filter="category">{{ .LinkTitle }}</a>
+        {{ end }}
     </div>
 {{ end }}
diff --git a/layouts/_partials/page-metadata/item/series.html b/layouts/_partials/page-metadata/item/series.html
index ac04bdb..3ff5425 100644
--- a/layouts/_partials/page-metadata/item/series.html
+++ b/layouts/_partials/page-metadata/item/series.html
@@ -1,11 +1,8 @@
 {{ with (.GetTerms "series") }}
-    {{ $series := slice }}
-    {{ range . }}
-        {{ $series = $series | append (printf `<a href="%s">%s</a>` .Permalink .LinkTitle) }}
-    {{ end }}
-
-    <div class="page-metadata-section series" data-pagefind-meta="series" aria-label="{{ i18n "aria_post_meta_series" }}">
+    <div class="page-metadata-section series" aria-label="{{ i18n "aria_post_meta_series" }}">
         {{ partial "icon.html" "files" }}
-        {{ delimit $series ", " | safeHTML }}
+        {{ range . }}
+            <a href="{{ .Permalink }}" data-pagefind-filter="series">{{ .LinkTitle }}</a>
+        {{ end }}
     </div>
 {{ end }}
diff --git a/layouts/_partials/page-metadata/item/tags.html b/layouts/_partials/page-metadata/item/tags.html
index 0a340f1..42760e4 100644
--- a/layouts/_partials/page-metadata/item/tags.html
+++ b/layouts/_partials/page-metadata/item/tags.html
@@ -1,11 +1,10 @@
 {{ with (.GetTerms "tags") }}
     {{ $tags := slice }}
-    {{ range . }}
-        {{ $tags = $tags | append (printf `<a href="%s">%s</a>` .Permalink .LinkTitle) }}
-    {{ end }}
 
-    <div class="page-metadata-section tags" data-pagefind-meta="tags" aria-label="{{ i18n "aria_post_meta_tags" }}">
+    <div class="page-metadata-section tags" aria-label="{{ i18n "aria_post_meta_tags" }}">
         {{ partial "icon.html" "tag" }}
-        {{ delimit $tags ", " | safeHTML }}
+        {{ range . }}
+            <a href="{{ .Permalink }}" data-pagefind-filter="tag">{{ .LinkTitle }}</a>
+        {{ end }}
     </div>
 {{ end }}