diff --git a/modules/blox-bootstrap/layouts/partials/page_metadata.html b/modules/blox-bootstrap/layouts/partials/page_metadata.html
index 294b7753..2376ebbc 100644
--- a/modules/blox-bootstrap/layouts/partials/page_metadata.html
+++ b/modules/blox-bootstrap/layouts/partials/page_metadata.html
@@ -53,12 +53,11 @@
     <a href="{{ $page.RelPermalink }}#disqus_thread"><!-- Count will be inserted here --></a>
   {{ end}}
 
-  {{ $taxonomy := "categories" }}
-  {{ if $page.Param $taxonomy }}
+  {{ if $page.Params.categories }}
   <span class="middot-divider"></span>
   <span class="article-categories">
     <i class="fas fa-folder mr-1"></i>
-    {{- range $index, $value := ($page.GetTerms $taxonomy) -}}
+    {{- range $index, $value := ($page.GetTerms "categories") -}}
       {{- if gt $index 0 }}, {{ end -}}
       <a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
     {{- end -}}
diff --git a/modules/blox-bootstrap/layouts/partials/page_metadata_authors.html b/modules/blox-bootstrap/layouts/partials/page_metadata_authors.html
index 5f027ef8..5eec60aa 100644
--- a/modules/blox-bootstrap/layouts/partials/page_metadata_authors.html
+++ b/modules/blox-bootstrap/layouts/partials/page_metadata_authors.html
@@ -1,8 +1,7 @@
 {{/* Display author list. */}}
 
-{{- $taxonomy := "authors" }}
-{{ if .Param $taxonomy }}
-  {{ range $index, $value := (.GetTerms $taxonomy) }}
+{{ if .Params.authors }}
+  {{ range $index, $value := (.GetTerms "authors") }}
     {{- /* Highlight the author's name? */ -}}
     {{- $highlight_name := .Page.Params.highlight_name | default false -}}
 
diff --git a/modules/blox-bootstrap/layouts/partials/tags.html b/modules/blox-bootstrap/layouts/partials/tags.html
index bcc81619..f33f8eff 100644
--- a/modules/blox-bootstrap/layouts/partials/tags.html
+++ b/modules/blox-bootstrap/layouts/partials/tags.html
@@ -1,7 +1,6 @@
-{{ $taxonomy := "tags" }}
-{{ if .Param $taxonomy }}
+{{ if .Params.tags }}
 <div class="article-tags">
-  {{ range $index, $value := (.GetTerms $taxonomy) }}
+  {{ range $index, $value := (.GetTerms "tags") }}
   <a class="badge badge-light" href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
   {{ end }}
 </div>