diff --git a/gum/templates/article.html b/gum/templates/article.html
index e43e48e..c1887f4 100644
--- a/gum/templates/article.html
+++ b/gum/templates/article.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% block title %}{{ article.title|striptags }}{% endblock %}
 {% block content %}
 <section id="content" class="body">
 
diff --git a/gum/templates/index.html b/gum/templates/index.html
index 83abf70..aae5ea5 100644
--- a/gum/templates/index.html
+++ b/gum/templates/index.html
@@ -28,7 +28,7 @@
 									{% if article.tags %}
 										<span>Tagged as : </span>
 										{% for tag in article.tags %}
-											<a class="danger label" href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>
+											<a class="danger label" href="{{ SITEURL }}/{{ tag.url }}">{{ tag|e }}</a>
 										{% endfor %}
 									{% endif %}
 								</div>
diff --git a/gum/templates/sidebar.html b/gum/templates/sidebar.html
index b0cd52b..442549e 100644
--- a/gum/templates/sidebar.html
+++ b/gum/templates/sidebar.html
@@ -33,7 +33,7 @@
 {% if tags %}
 	<ul>
 	{% for tag in tag_cloud %}
-	    <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/{{ tag.0.url }}">{{ tag.0 }}</a></li>
+	    <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/{{ tag.0.url }}">{{ tag.0|e }}</a></li>
 	{% endfor %}
 </ul>
 {% endif %}
diff --git a/gum/templates/tag.html b/gum/templates/tag.html
index 68cdcba..dc697fe 100644
--- a/gum/templates/tag.html
+++ b/gum/templates/tag.html
@@ -1,2 +1,2 @@
 {% extends "index.html" %}
-{% block title %}{{ SITENAME }} - {{ tag }}{% endblock %}
+{% block title %}{{ SITENAME }} - {{ tag|e }}{% endblock %}
diff --git a/gum/templates/tags.html b/gum/templates/tags.html
index 862eff6..ec380b7 100644
--- a/gum/templates/tags.html
+++ b/gum/templates/tags.html
@@ -5,7 +5,7 @@
 {% for tag in tag_cloud %}
 <li class="tag-{{ tag.1 }}">
 	<a href="{{ SITEURL }}/{{ tag.0.url }}">
-		<i class="icon-tag icon-large"></i>{{ tag.0 }}
+		<i class="icon-tag icon-large"></i>{{ tag.0|e }}
 	</a>
 </li>
 {% endfor %}