diff --git a/templates/content-tags.tpl.html b/templates/content-tags.tpl.html
index 6345329..ef3884c 100644
--- a/templates/content-tags.tpl.html
+++ b/templates/content-tags.tpl.html
@@ -5,12 +5,10 @@
 $Template::Stash::PRIVATE = undef; # Allow . in tag
 <!--% END %-->
 <!--% uniq_tag_count = 0 %-->
-<!--% comma_re = '(?x)(?:^|,\s*)(?:"((?>[^"]*)(?:""[^"]*)*)"|([^",]*))'; %-->
-<!--# 'Moka5,interview, "computer science"' -->
 <!--% FOREACH episode IN DBI.query(query_tags);
     ep_id = episode.id;
     ep_tags = episode.tags;
-    FOREACH tag_str IN ep_tags.split(comma_re);
+    FOREACH tag_str IN ep_tags.csv_parse;
         NEXT UNLESS tag_str;
         NEXT IF tag_str == '';
         tag = tag_str.lower;