diff --git a/ram/portal/static/css/main.css b/ram/portal/static/css/main.css
index 6baef48..96a54c2 100644
--- a/ram/portal/static/css/main.css
+++ b/ram/portal/static/css/main.css
@@ -6,6 +6,11 @@
   display: inline-block;
 }
 
+a.badge, a.badge:hover {
+  text-decoration: none;
+  color: #fff;
+}
+
 .tab-pane {
   min-height: 300px;
 }
diff --git a/ram/portal/templates/base.html b/ram/portal/templates/base.html
index 5f2d38d..37b33f9 100644
--- a/ram/portal/templates/base.html
+++ b/ram/portal/templates/base.html
@@ -85,8 +85,8 @@
                   <p class="card-text"><strong>{{ r }}</strong></p>
                   {% if r.tags.all %}
                   <p class="card-text"><small>Tags:</small>
-                   {% for t in r.tags.all %}<span class="badge bg-primary">
-                    {{ t.name }}</span>{# new line is required #}
+                    {% for t in r.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
+                    {{ t.name }}</a>{# new line is required #}
                     {% endfor %}
                   </p>
                   {% endif %}
diff --git a/ram/portal/templates/consists.html b/ram/portal/templates/consists.html
index 02b20fb..af72f1c 100644
--- a/ram/portal/templates/consists.html
+++ b/ram/portal/templates/consists.html
@@ -13,8 +13,8 @@
             <p class="card-text"><strong>{{ c }}</strong></p>
             {% if c.tags.all %}
             <p class="card-text"><small>Tags:</small>
-             {% for t in c.tags.all %}<span class="badge bg-primary">
-              {{ t.name }}</span>{# new line is required #}
+              {% for t in c.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
+              {{ t.name }}</a>{# new line is required #}
               {% endfor %}
             </p>
             {% endif %}
diff --git a/ram/portal/templates/page.html b/ram/portal/templates/page.html
index 06129b5..4bc34e2 100644
--- a/ram/portal/templates/page.html
+++ b/ram/portal/templates/page.html
@@ -5,8 +5,8 @@
         <h1 class="fw-light">{{ rolling_stock }}</h1>
         {% if rolling_stock.tags.all %}
         <p><small>Tags:</small>
-         {% for t in rolling_stock.tags.all %}<span class="badge bg-primary">
-          {{ t.name }}</span>{# new line is required #}
+          {% for t in rolling_stock.tags.all %}<a href="{% url 'filtered' _filter="tag" search=t.slug %}" class="badge rounded-pill bg-primary">
+          {{ t.name }}</a>{# new line is required #}
           {% endfor %}
         </p>
         {% endif %}
diff --git a/ram/portal/views.py b/ram/portal/views.py
index 3a16848..be26982 100644
--- a/ram/portal/views.py
+++ b/ram/portal/views.py
@@ -73,6 +73,8 @@ class GetHomeFiltered(View):
             )
         elif _filter == "scale":
             query = Q(scale__scale__icontains=search)
+        elif _filter == "tag":
+            query = Q(tags__slug__icontains=search)
         else:
             raise Http404
         rolling_stock = (