diff --git a/froide_govplan/models.py b/froide_govplan/models.py
index 8a35d30..0b29ec5 100644
--- a/froide_govplan/models.py
+++ b/froide_govplan/models.py
@@ -17,11 +17,10 @@ from taggit.models import TaggedItemBase
 
 from froide.foirequest.models import FoiRequest
 from froide.follow.models import Follower
-from froide.helper.forms import TAG_NAME_MAX_CHARS
 from froide.organization.models import Organization
 from froide.publicbody.models import Category, Jurisdiction, PublicBody
 
-from .utils import PLAN_TAG_PREFIX, TAG_NAME, make_request_url
+from .utils import TAG_NAME, make_request_url
 
 try:
     from cms.models.fields import PlaceholderField
@@ -249,9 +248,8 @@ class GovernmentPlan(models.Model):
     def get_recent_foirequest(self):
         return self.get_related_foirequests()[0]
 
-    def get_plan_tag(self):
-        plan_tag = "{}{}".format(PLAN_TAG_PREFIX, self.slug)
-        return plan_tag[:TAG_NAME_MAX_CHARS]
+    def get_foirequest_reference(self):
+        return "govplan:plan@{}".format(self.pk)
 
     def get_related_foirequests(self):
         if not self.responsible_publicbody:
@@ -265,7 +263,7 @@ class GovernmentPlan(models.Model):
                 public_body=self.responsible_publicbody,
             )
             .filter(tags__name=TAG_NAME)
-            .filter(tags__name=self.get_plan_tag())
+            .filter(reference=self.get_foirequest_reference())
             .order_by("-first_message")
         )
         return self._related_foirequests
diff --git a/froide_govplan/utils.py b/froide_govplan/utils.py
index 52e13ee..2587a65 100644
--- a/froide_govplan/utils.py
+++ b/froide_govplan/utils.py
@@ -4,7 +4,6 @@ from django.conf import settings
 from django.urls import reverse
 
 TAG_NAME = "Koalitionstracker"
-PLAN_TAG_PREFIX = "Vorhaben-"
 
 
 def make_request_url(plan, publicbody):
@@ -19,7 +18,8 @@ def make_request_url(plan, publicbody):
     query = {
         "subject": subject.encode("utf-8"),
         "body": body,
-        "tags": "{},{}".format(TAG_NAME, plan.get_plan_tag()),
+        "ref": plan.get_foirequest_reference(),
+        "tags": TAG_NAME,
     }
 
     hide_features = ["hide_public", "hide_similar", "hide_draft"]