diff --git a/templates/tags/list.html b/templates/tags/list.html
index 16ffdf1..fa57fdf 100644
--- a/templates/tags/list.html
+++ b/templates/tags/list.html
@@ -14,7 +14,7 @@
 
 <section class="tag-list">
 	{% for tag in terms %}
-		<a href="{{ tag.path|safe }}">{{ tag.name }}</a> ({{ tag.pages | length }})<br/>
+		<a href="{{ tag.path | safe }}">{{ tag.name | safe }}</a> ({{ tag.pages | length }})<br/>
 	{% endfor %}
 </section>
 {% endblock main %}
diff --git a/templates/tags/single.html b/templates/tags/single.html
index 788c72f..8e49ce7 100644
--- a/templates/tags/single.html
+++ b/templates/tags/single.html
@@ -7,14 +7,14 @@
 {% endblock head %}
 
 {% block main %}
-<h1>{{term.name | safe}}</h1>
+<h1>{{ term.name | safe }}</h1>
 
 <section class="article-list">
 	{% for page in term.pages %}
 		<article>
-			<h2 class="article-list_title"><a href="{{page.permalink|safe}}">{{page.title}}</a></h2>
-			<small>{{page.date}}</small>
-			<p>{{page.description|safe}}</p>
+			<h2 class="article-list_title"><a href="{{ page.permalink | safe }}">{{ page.title | safe }}</a></h2>
+			<small>{{ page.date }}</small>
+			<p>{{ page.description | safe }}</p>
 		</article>
 	{% endfor %}
 </section>