diff --git a/templates/article.html b/templates/article.html
index 2846e1d4..73dba48e 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -16,7 +16,11 @@
 {% endif %}
 {{ super() }}
 {% if article.tags or article.category or article.keywords %}
-<meta name="keywords" content="{{ ((article.tags or [])+(article.categories or [article.category]|map("string")) + (article.keywords or []))|join(', ') }}" />
+<meta name="keywords" content="{{ (
+	(article.tags | default([]))  +
+	(article.categories | default([article.category] if article.category else []) ) +
+	([article.keywords] if article.keywords else [])
+	) | join(', ') }}" />
 {% endif %}
 
 {% from '_includes/smo_metadata.html' import smo_metadata with context %}