diff --git a/layouts/partials/series-meta-item.html b/layouts/partials/series-meta-item.html
index 7ea186b..4eff26b 100644
--- a/layouts/partials/series-meta-item.html
+++ b/layouts/partials/series-meta-item.html
@@ -1,10 +1,12 @@
-{{ with .Params.series }}
+{{ with (.GetTerms "series") }}
+
+{{ $series := slice }}
+{{ range . }}
+{{ $series = $series | append (printf `<a href="%s">%s</a>` .Permalink .LinkTitle) }}
+{{ end }}
+
 <div class="series">
-    {{ range ($.GetTerms "series") }}
-    <span class="post-meta-item">
-        {{ partial "icon.html" "files" }}
-        <a href="{{ .Permalink }}">{{ .LinkTitle }}</a>
-    </span>
-    {{ end }}
+    {{ partial "icon.html" "files" }}
+    {{ delimit $series ", " }}
 </div>
 {{ end }}
diff --git a/layouts/partials/tags-meta-item.html b/layouts/partials/tags-meta-item.html
index a1ca840..4574c4f 100644
--- a/layouts/partials/tags-meta-item.html
+++ b/layouts/partials/tags-meta-item.html
@@ -1,8 +1,14 @@
+{{ with (.GetTerms "tags") }}
+
+{{ $tags := slice }}
+{{ range . }}
+{{ $tags = $tags | append (printf `<a href="%s">%s</a>` .Permalink .LinkTitle) }}
+{{ end }}
+
 <div class="tags">
-    {{ range (.GetTerms "tags") }}
+    {{ partial "icon.html" "tag" }}
     <span class="post-meta-item">
-        {{ partial "icon.html" "tag" }}
-        <a href="{{ .Permalink }}">{{ .LinkTitle }}</a>
+        {{ delimit $tags ", " }}
     </span>
-    {{ end }}
 </div>
+{{ end }}