diff --git a/templates/article_list.html b/templates/article_list.html
index ad6ead0..fae3183 100644
--- a/templates/article_list.html
+++ b/templates/article_list.html
@@ -35,7 +35,7 @@
 		{%- if config.taxonomies | length > 0 -%}
 		    {%- 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) -}}
+				{{- macros_translate::translate(key="filter_by_tag", default="Filter by $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}
 			</a>
 			<br />
 		{%- endif %}
diff --git a/templates/taxonomy_list.html b/templates/taxonomy_list.html
index 76ac026..84f9951 100644
--- a/templates/taxonomy_list.html
+++ b/templates/taxonomy_list.html
@@ -1,12 +1,12 @@
 {% extends "base.html" %}
 
 {% block content %}
-{%- set number_of_tags = terms | length -%}
+{%- set number_of_terms = terms | length -%}
 {%- 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>
-	<small>{{- macros_translate::translate(key="tags", number=number_of_tags, default="$NUMBER $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}</small>
+	<small>{{- macros_translate::translate(key="tags", number=number_of_terms, default="$NUMBER $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}</small>
 </p>
 
 <ul class="tags">