diff --git a/theme/templates/article.html b/theme/templates/article.html
index f45ddad..a9d3ce6 100644
--- a/theme/templates/article.html
+++ b/theme/templates/article.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %} 
 
 {% block title %}{{ article.title }} – {{ SITENAME }}{% endblock %} 
-{% block metadesc %}{% if article.summary %}{{ article.summary | e }}{% else %}An Article in {{ SITETAG }}: {{ article.title }}{% endif %}{% endblock %} 
+{% block metadesc %}{% if article.summary %}{{ article.summary | striptags | e }}{% else %}{{ article.title }}{% endif %}{% endblock %} 
 
 {% block content_all %}
 <article>
diff --git a/theme/templates/index.html b/theme/templates/index.html
index 541c5e3..7986e14 100644
--- a/theme/templates/index.html
+++ b/theme/templates/index.html
@@ -1,5 +1,7 @@
 {% extends "page.html" %}
 
+{% block title %}{{ SITENAME }}, {{ SITESUBTITLE }}{% endblock %}
+
 {% block content_header %}
 {% endblock content_header %}
 
diff --git a/theme/templates/tag.html b/theme/templates/tag.html
index 9dd4ba7..2f972f1 100644
--- a/theme/templates/tag.html
+++ b/theme/templates/tag.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block title %}Schlagwort: {{ tag }} – {{ SITENAME }}{% endblock %}
-{% block metadesc %}Alle Einträge zum Schlagwort '{{ tag }}'{% endblock %}
+{% block metadesc %}All meine Bücher, Texte und Einträge zum Schlagwort '{{ tag }}'{% endblock %}
 
 {% block content_all %}
 {% block content_header %}