diff --git a/photologue_custom/templates/photologue/gallery_detail.html b/photologue_custom/templates/photologue/gallery_detail.html
index 182b8e0..8c8692d 100644
--- a/photologue_custom/templates/photologue/gallery_detail.html
+++ b/photologue_custom/templates/photologue/gallery_detail.html
@@ -26,7 +26,7 @@
 {% if gallery.extended.tags.all %}
 <p class="text-muted">
     Tags : {% for tag in gallery.extended.tags.all %}
-    <a class="badge rounded-pill bg-dark text-decoration-none" href="{% url 'tag-detail' tag %}">{{ tag }}</a>
+    <a class="badge rounded-pill bg-dark text-decoration-none" href="{% url 'tag-detail' tag.slug %}">{{ tag }}</a>
     {% endfor %}
 </p>
 {% endif %}
diff --git a/photologue_custom/views.py b/photologue_custom/views.py
index 285ae5e..0a29748 100644
--- a/photologue_custom/views.py
+++ b/photologue_custom/views.py
@@ -23,7 +23,7 @@ class TagDetail(LoginRequiredMixin, DetailView):
         current_tag = self.get_object().slug
         context = super().get_context_data(**kwargs)
         context['galleries'] = Gallery.objects.on_site().is_public() \
-            .filter(extended__tags__name=current_tag)
+            .filter(extended__tags__slug=current_tag)
         return context