diff --git a/templates/article_list.html b/templates/article_list.html
index 9f345b1..b6aa8a2 100644
--- a/templates/article_list.html
+++ b/templates/article_list.html
@@ -33,11 +33,13 @@
 <p>
 	<small>
 		{%- if config.taxonomies | length > 0 -%}
-		    {%- set taxon_name = config.taxonomies.name -%}
-			<a href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=taxon_name) -}}">
-				{{- macros_translate::translate(key="filter_by_tag", default="Filter by $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}
-			</a>
-			<br />
+		    {%- for taxon in config.taxonomies -%}
+		        {%- set taxon_name = taxonomy.name -%}
+			    <a href="{{- get_url(path='$TAXON', lang=lang) | replace(from="$TAXON", to=taxon_name) -}}">
+				    {{- macros_translate::translate(key="filter_by_tag", default="Filter by $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}
+			    </a>
+			    <br />
+			{%- endfor %}
 		{%- endif %}
 		{{ macros_translate::translate(key="posts", number=number_of_posts, default="$NUMBER posts in total", language_strings=language_strings) }}
 	</small>
diff --git a/templates/taxonomy_list.html b/templates/taxonomy_list.html
index 52fe51c..84f9951 100644
--- a/templates/taxonomy_list.html
+++ b/templates/taxonomy_list.html
@@ -2,7 +2,7 @@
 
 {% block content %}
 {%- set number_of_terms = terms | length -%}
-{%- set taxon_name = config.taxonomies.name -%}
+{%- set taxon_name = taxonomy.name -%}
 <h1>{{- macros_translate::translate(key="tags_title", default="$TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}</h1>
 
 <p>
diff --git a/templates/taxonomy_single.html b/templates/taxonomy_single.html
index 6365f58..e049de0 100644
--- a/templates/taxonomy_single.html
+++ b/templates/taxonomy_single.html
@@ -5,7 +5,7 @@
 {%- set date_locale = macros_translate::translate(key="date_locale", default="en_US", language_strings=language_strings) -%}
 {%- set number_of_posts = term.pages | length -%}
 
-{%- set taxon_name = config.taxonomies.name -%}
+{%- set taxon_name = taxonomy.name -%}
 {%- set term_name = "“" ~ term.name ~ "”" -%}
 <h1>
 	{{- macros_translate::translate(key="posts_with_tag", default="Posts with $TAXON $TERM", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) | replace(from="$TERM", to=term_name) -}}