diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html
index de86ccb..298fbbd 100644
--- a/pagure/templates/issues.html
+++ b/pagure/templates/issues.html
@@ -124,38 +124,17 @@
 
   <span class="btn-group btn-group-sm issues-tagbar" role="group" aria-label="Basic example">
     {% for tag in tag_list %}
-      {% if tag.tag in tags %}
-        {% if status and status != 'Open' %}
-        <a class="btn btn-secondary btn-sm {% if tag.tag in tags%}active{% endif %}"
-            href="{{ url_for('view_issues',
-                repo=repo.name,
-                username=username,
-                search_pattern=search_pattern,
-                namespace=repo.namespace,
-                status='Closed') }}" title="Filter issues by tag">
-         {% else %}
-        <a class="btn btn-secondary btn-sm {% if tag.tag in tags%}active{% endif %}"
-            href="{{ url_for('view_issues',
-                repo=repo.name,
-                username=username,
-                search_pattern=search_pattern,
-                namespace=repo.namespace,
-                status=status or 'all') }}"
-                title="Filter issues by tag">
-         {% endif %}
-      {% else %}
         <a class="btn btn-secondary btn-sm {% if tag.tag in tags%}active{%endif%}"
             href="{{ url_for('view_issues',
                 repo=repo.name,
                 username=username,
                 namespace=repo.namespace,
-                tags=tag.tag,
+                tags=tag.tag | add_or_remove(tags[:]),
                 search_pattern=search_pattern,
                 author=author,
                 assignee=assignee,
                 status=status or 'all') }}"
                 title="Filter issues by tag">
-      {% endif %}
         <span class="oi" data-glyph="tag"></span>
         {{ tag.tag }}</a>
     {% endfor %}
diff --git a/pagure/templates/roadmap.html b/pagure/templates/roadmap.html
index 94eaac7..589b883 100644
--- a/pagure/templates/roadmap.html
+++ b/pagure/templates/roadmap.html
@@ -132,28 +132,16 @@
   <span class="btn-group btn-group-sm issues-tagbar" role="group" aria-label="Basic example">
   <span class="oi m-l-2 btn btn-nopad" data-glyph="tag" title="Tags"></span>
     {% for tag in tag_list %}
-      {% if tag in tags %}
-        <a class="btn btn-secondary btn-sm {% if tag in tags %}active{% endif %}"
-          href="{{ url_for('view_roadmap',
-              repo=repo.name,
-              username=username,
-              namespace=repo.namespace,
-              milestone=requested_stones,
-              all_stones=all_stones,
-              status=status) }}"
-              title="Filter issues by tag">
-      {% else %}
         <a class="btn btn-secondary btn-sm {% if tag in tags %}active{% endif %}"
           href="{{ url_for('view_roadmap',
               repo=repo.name,
               username=username,
               namespace=repo.namespace,
               status=status,
-              tag=tag,
+              tag=tag | add_or_remove(tags[:]),
               all_stones=all_stones,
               milestone=requested_stones) }}"
               title="Filter issues by tag">
-      {% endif %}
         {{ tag }}</a>
     {% endfor %}
   </span>
diff --git a/pagure/ui/filters.py b/pagure/ui/filters.py
index 647ab30..ae5e36f 100644
--- a/pagure/ui/filters.py
+++ b/pagure/ui/filters.py
@@ -572,3 +572,15 @@ def combine_url(url, page, pagetitle, **kwargs):
     query[pagetitle] = page
     query.update(kwargs)
     return url + '?' + '&'.join(['%s=%s' % (k, query[k]) for k in query])
+
+
+@APP.template_filter('add_or_remove')
+def add_or_remove(item, items):
+    """ Adds the item to the list if it is not in there and remove it
+    otherwise.
+    """
+    if item in items:
+        items.remove(item)
+    else:
+        items.append(item)
+    return items