diff --git a/ram/metadata/admin.py b/ram/metadata/admin.py
index f10ac6d..87caae8 100644
--- a/ram/metadata/admin.py
+++ b/ram/metadata/admin.py
@@ -27,8 +27,8 @@ class DecoderAdmin(admin.ModelAdmin):
 
 @admin.register(Scale)
 class ScaleAdmin(admin.ModelAdmin):
-    list_display = ("scale", "ratio", "gauge")
-    list_filter = ("ratio", "gauge")
+    list_display = ("scale", "ratio", "gauge", "track")
+    list_filter = ("ratio", "gauge", "track")
     search_fields = list_display
 
 
diff --git a/ram/metadata/migrations/0005_rename_gauge_scale_track.py b/ram/metadata/migrations/0005_rename_gauge_scale_track.py
new file mode 100644
index 0000000..ba09c6e
--- /dev/null
+++ b/ram/metadata/migrations/0005_rename_gauge_scale_track.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.0.6 on 2022-07-18 21:40
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('metadata', '0004_alter_rollingstocktype_options_and_more'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='scale',
+            old_name='gauge',
+            new_name='track',
+        ),
+    ]
diff --git a/ram/metadata/migrations/0006_scale_gauge.py b/ram/metadata/migrations/0006_scale_gauge.py
new file mode 100644
index 0000000..043c293
--- /dev/null
+++ b/ram/metadata/migrations/0006_scale_gauge.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.0.6 on 2022-07-18 21:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('metadata', '0005_rename_gauge_scale_track'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='scale',
+            name='gauge',
+            field=models.CharField(blank=True, max_length=16),
+        ),
+    ]
diff --git a/ram/metadata/models.py b/ram/metadata/models.py
index 2b986f8..029db58 100644
--- a/ram/metadata/models.py
+++ b/ram/metadata/models.py
@@ -85,6 +85,7 @@ class Scale(models.Model):
     scale = models.CharField(max_length=32, unique=True)
     ratio = models.CharField(max_length=16, blank=True)
     gauge = models.CharField(max_length=16, blank=True)
+    track = models.CharField(max_length=16, blank=True)
 
     class Meta:
         ordering = ["scale"]
diff --git a/ram/portal/templates/consist.html b/ram/portal/templates/consist.html
index 8256abd..656a581 100644
--- a/ram/portal/templates/consist.html
+++ b/ram/portal/templates/consist.html
@@ -5,11 +5,11 @@
         <h1 class="fw-light">{{ consist }}</h1>
         {% if consist.tags.all %}
         <p><small>Tags:</small>
-         {% for t in consist.tags.all %}<span class="badge bg-primary">
-          {{ t.name }}</span>{# new line is required #}
+          {% for t in consist.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 %}
+      {% endif %}
       {% endblock %}
       {% block cards %}
       {% for r in rolling_stock %}
@@ -25,8 +25,8 @@
             </p>
             {% if r.rolling_stock.tags.all %}
             <p class="card-text"><small>Tags:</small>
-             {% for t in r.rolling_stock.tags.all %}<span class="badge bg-primary">
-              {{ t.name }}</span>{# new line is required #}
+              {% for t in r.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/ram/__init__.py b/ram/ram/__init__.py
index 3b6cea5..9c10b92 100644
--- a/ram/ram/__init__.py
+++ b/ram/ram/__init__.py
@@ -1,4 +1,4 @@
 from ram.utils import git_suffix
 
-__version__ = "0.0.8"
+__version__ = "0.0.9"
 __version__ += git_suffix(__file__)