diff --git a/templates/partials/topset.html b/templates/partials/topset.html
index 36155ec..9efc567 100644
--- a/templates/partials/topset.html
+++ b/templates/partials/topset.html
@@ -2,7 +2,7 @@
     <td class="p-0 sm:p-4 text-sm font-semibold text-gray-900 break-normal">
         {% if is_edit|default(false, true) == false %}
         <div class="flex items-center space-x-2">
-            <span class="cursor-pointer" hx-get="{{ url_for('goto_tag') }}"
+            <span class="cursor-pointer" hx-get="{{ url_for('tags.goto_tag') }}"
                 hx-vals='{"filter": "?exercise_id={{ exercise_id }}", "person_id" : "{{ person_id }}" }'
                 hx-target="#container" hx-swap="innerHTML" hx-push-url="true"
                 _='on click trigger closeModalWithoutRefresh'>{{ exercise_name }}</span>
diff --git a/templates/partials/workout_tags_list.html b/templates/partials/workout_tags_list.html
index 7e13df9..766c1ca 100644
--- a/templates/partials/workout_tags_list.html
+++ b/templates/partials/workout_tags_list.html
@@ -1,10 +1,11 @@
-{% if tags|length == 0 %}
+{% if tags|length > 0 %}
 {% for tag in tags %}
 {% if tag.is_selected %}
 <span
     class="text-xs font-semibold inline-block py-1 px-2 uppercase rounded text-pink-600 bg-pink-200 uppercase last:mr-0 mr-1 max-h-fit cursor-pointer"
-    hx-get="{{ url_for('goto_tag') }}" hx-vals='{"filter": "{{ tag.tag_filter }}", "person_id": "{{ tag.person_id }}"}'
-    hx-target="#container" hx-push-url="true">
+    hx-get="{{ url_for('tags.goto_tag') }}"
+    hx-vals='{"filter": "{{ tag.tag_filter }}", "person_id": "{{ tag.person_id }}"}' hx-target="#container"
+    hx-push-url="true">
     {{ tag.tag_name }}
 </span>
 {% endif %}