diff --git a/froide_govplan/models.py b/froide_govplan/models.py
index 2eedc91..8d8e8b5 100644
--- a/froide_govplan/models.py
+++ b/froide_govplan/models.py
@@ -287,6 +287,18 @@ class GovernmentPlanUpdate(models.Model):
     def __str__(self):
         return "{} - {} ({})".format(self.title, self.timestamp, self.plan)
 
+    def get_absolute_url(self):
+        return "{}#update-{}".format(
+            reverse(
+                "govplan:plan",
+                kwargs={"gov": self.government.slug, "plan": self.plan.slug},
+            ),
+            self.id,
+        )
+
+    def get_absolute_domain_url(self):
+        return settings.SITE_URL + self.get_absolute_url()
+
 
 class GovernmentPlanFollower(Follower):
     content_object = models.ForeignKey(
diff --git a/froide_govplan/templates/froide_govplan/base.html b/froide_govplan/templates/froide_govplan/base.html
index 93f4825..2c16cee 100644
--- a/froide_govplan/templates/froide_govplan/base.html
+++ b/froide_govplan/templates/froide_govplan/base.html
@@ -9,8 +9,8 @@
   <nav class="breadcrumb-container" aria-label="breadcrumb">
     <div class="container">
       <ol class="breadcrumb">
-        {# TODO: make this dynamic #}
-        <li class="breadcrumb-item"><a href="/koalitionstracker/">Koalitionstracker</a></li>
+        {% page_url 'koalitionstracker' as base_url %}
+        <li class="breadcrumb-item"><a href="{{ base_url }}">Koalitionstracker</a></li>
         {% block govplan_breadcrumbs %}{% endblock %}
       </ol>
     </div>
diff --git a/froide_govplan/templates/froide_govplan/detail.html b/froide_govplan/templates/froide_govplan/detail.html
index 10adff7..3ff3ede 100644
--- a/froide_govplan/templates/froide_govplan/detail.html
+++ b/froide_govplan/templates/froide_govplan/detail.html
@@ -33,7 +33,7 @@
                 </li>
                 {% for cat in object.categories.all %}
                 <li>
-                  <a href="{% comment %} TODO: link to category {% endcomment %}">
+                  <a href="{{ section.get_absolute_url }}">
                     <span class="badge badge-light mr-2">{{ cat.name }}</span>
                   </a>
                 </li>
diff --git a/froide_govplan/templates/froide_govplan/section.html b/froide_govplan/templates/froide_govplan/section.html
index 4facff1..dc60b2a 100644
--- a/froide_govplan/templates/froide_govplan/section.html
+++ b/froide_govplan/templates/froide_govplan/section.html
@@ -57,8 +57,8 @@
               {% endblocktranslate %}
             </p>
 
-            {# TODO: make this dynamic #}
-            <a href="/koalitionstracker/" class="action-link">zurück zu allen Kategorien</a>
+            {% page_url 'koalitionstracker' as base_url %}
+            <a href="{{ base_url }}" class="action-link">zurück zu allen Kategorien</a>
           </div>
         </div>
       </div>
diff --git a/froide_govplan/views.py b/froide_govplan/views.py
index fec6418..1509c41 100644
--- a/froide_govplan/views.py
+++ b/froide_govplan/views.py
@@ -41,11 +41,17 @@ class GovPlanDetailView(GovernmentMixin, DetailView):
             return qs
         return qs.filter(public=True)
 
+    def get_section(self):
+        return GovernmentPlanSection.objects.filter(
+            categories__in=self.object.categories.all()
+        ).first()
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["updates"] = self.object.updates.filter(public=True).order_by(
             "-timestamp"
         )
+        context["section"] = self.get_section()
         return context