diff --git a/website/templates/category.html b/website/templates/category.html
index 19d9817..43da9a9 100644
--- a/website/templates/category.html
+++ b/website/templates/category.html
@@ -169,9 +169,9 @@
           </td>
           <td class="col-cat">
             {% for subcat in entry.subcategories %}
-            <button class="tag{% if subcat.url == current_path %} active{% endif %}" data-value="{{ subcat.value }}" data-url="{{ subcat.url }}">
+            <a class="tag{% if subcat.url == current_path %} active{% endif %}" href="{{ subcat.url }}" data-value="{{ subcat.value }}" data-url="{{ subcat.url }}">
               {{ subcat.name }}
-            </button>
+            </a>
             {% endfor %}
             {% for cat in entry.categories %}
             <a
@@ -184,22 +184,24 @@
             {% endfor %}
             {% if entry.groups %}
             {% set group_url = filter_urls[entry.groups[0]] %}
-            <button
+            <a
               class="tag tag-group{% if group_url == current_path %} active{% endif %}"
+              href="{{ group_url }}"
               data-value="{{ entry.groups[0] }}"
               data-url="{{ group_url }}"
             >
               {{ entry.groups[0] }}
-            </button>
+            </a>
             {% endif %}
             {% if entry.source_type == 'Built-in' %}
-            <button
+            <a
               class="tag tag-source{% if '/categories/built-in/' == current_path %} active{% endif %}"
+              href="/categories/built-in/"
               data-value="Built-in"
               data-url="/categories/built-in/"
             >
               Built-in
-            </button>
+            </a>
             {% endif %}
           </td>
           <td class="col-arrow"><span class="arrow">&rarr;</span></td>
diff --git a/website/templates/index.html b/website/templates/index.html
index 367bccc..c76cd7c 100644
--- a/website/templates/index.html
+++ b/website/templates/index.html
@@ -220,9 +220,9 @@
           </td>
           <td class="col-cat">
             {% for subcat in entry.subcategories %}
-            <button class="tag" data-value="{{ subcat.value }}" data-url="{{ subcat.url }}">
+            <a class="tag" href="{{ subcat.url }}" data-value="{{ subcat.value }}" data-url="{{ subcat.url }}">
               {{ subcat.name }}
-            </button>
+            </a>
             {% endfor %} {% for cat in entry.categories %}
             <a
               class="tag"
@@ -232,21 +232,23 @@
               >{{ cat }}</a
             >
             {% endfor %}
-            <button
+            <a
               class="tag tag-group"
+              href="{{ filter_urls[entry.groups[0]] }}"
               data-value="{{ entry.groups[0] }}"
               data-url="{{ filter_urls[entry.groups[0]] }}"
             >
               {{ entry.groups[0] }}
-            </button>
+            </a>
             {% if entry.source_type == 'Built-in' %}
-            <button
+            <a
               class="tag tag-source"
+              href="/categories/built-in/"
               data-value="Built-in"
               data-url="/categories/built-in/"
             >
               Built-in
-            </button>
+            </a>
             {% endif %}
           </td>
           <td class="col-arrow"><span class="arrow">&rarr;</span></td>