diff --git a/client/js/components/map/publicdetail/Map.vue b/client/js/components/map/publicdetail/Map.vue
index 3033aa747f..0af8ff7b37 100644
--- a/client/js/components/map/publicdetail/Map.vue
+++ b/client/js/components/map/publicdetail/Map.vue
@@ -394,7 +394,7 @@ export default {
 
     addTerritoryLayer () {
       //  If there is no territory wms layer defined but a "hand-drawn" territory, craft a vector layer from it
-      if (!this.hasTerritoryWMS && this.procedureSettings.territory.length > 0 && this.procedureSettings.territory !== '{}') {
+      if (!this.hasTerritoryWMS && this.hasTerritory()) {
         //  Read GeoJson features
         const features = new GeoJSON().readFeatures(this.procedureSettings.territory)
 
@@ -1614,6 +1614,10 @@ export default {
       this.$root.$emit('changeActive')
     },
 
+    hasTerritory() {
+      return this.procedureSettings.territory && this.procedureSettings.territory.features.length > 0
+    },
+
     removeOtherInteractions (reset) {
       this.map.getInteractions().forEach(interaction => {
         if (interaction instanceof Draw) {
diff --git a/client/js/components/procedure/admin/DpAddOrganisationList.vue b/client/js/components/procedure/admin/DpAddOrganisationList.vue
index dd5f4d0b6d..aba937c4e5 100644
--- a/client/js/components/procedure/admin/DpAddOrganisationList.vue
+++ b/client/js/components/procedure/admin/DpAddOrganisationList.vue
@@ -30,23 +30,25 @@
             <dt class="color--grey">
               {{ Translator.trans('address') }}
             </dt>
+            <template v-if="locationContacts && hasAdress">
+              <dd
+                v-if="locationContacts.street"
+                class="ml-0">
+                {{ locationContacts.street }}
+              </dd>
+              <dd
+                v-if="locationContacts.postalcode"
+                class="ml-0">
+                {{ locationContacts.postalcode }}
+              </dd>
+              <dd
+                v-if="locationContacts.city"
+                class="ml-0">
+                {{ locationContacts.city }}
+              </dd>
+            </template>
             <dd
-              v-if="locationContacts.street"
-              class="ml-0">
-              {{ locationContacts.street }}
-            </dd>
-            <dd
-              v-if="locationContacts.postalcode"
-              class="ml-0">
-              {{ locationContacts.postalcode }}
-            </dd>
-            <dd
-              v-if="locationContacts.city"
-              class="ml-0">
-              {{ locationContacts.city }}
-            </dd>
-            <dd
-              v-if="!locationContacts.street && !locationContacts.city && !locationContacts.postalCode"
+              v-else
               class="ml-0">
               {{ Translator.trans('notspecified') }}
             </dd>
@@ -56,7 +58,7 @@
               {{ Translator.trans('phone') }}
             </dt>
             <dd
-              v-if="locationContacts.hasOwnProperty('phone') && locationContacts.phone"
+              v-if="locationContacts?.hasOwnProperty('phone') && locationContacts.phone"
               class="ml-0">
               {{ locationContacts.phone }}
             </dd>
@@ -179,8 +181,8 @@ export default {
 
     rowItems () {
       return Object.values(this.invitableToebItems).reduce((acc, item) => {
-        const locationContactId = item.relationships.locationContacts.data[0].id
-        const locationContact = this.getLocationContactById(locationContactId)
+        const locationContactId = item.relationships.locationContacts?.data.length > 0 ? item.relationships.locationContacts.data[0].id : null
+        const locationContact = locationContactId ? this.getLocationContactById(locationContactId) : null
         const hasNoEmail = !item.attributes.participationFeedbackEmailAddress
 
         return [
@@ -189,10 +191,10 @@ export default {
             {
               id: item.id,
               ...item.attributes,
-              locationContacts: {
+              locationContacts: locationContact ? {
                 id: locationContact.id,
                 ...locationContact.attributes
-              },
+              } : null,
               hasNoEmail
             }
           ]
@@ -267,6 +269,10 @@ export default {
       return this.institutionLocationContactItems[id]
     },
 
+    hasAdress () {
+      return this.rowItems.locationContacts?.street || this.rowItems.locationContacts?.postalcode || this.rowItems.locationContacts?.city
+    },
+
     returnPermissionChecksValuesArray (permissionChecks) {
       return permissionChecks.reduce((acc, check) => {
         if (hasPermission(check.permission)) {
diff --git a/client/js/components/statement/DpStatementAnonymize.vue b/client/js/components/statement/DpStatementAnonymize.vue
index f05feea035..5414b2ede8 100644
--- a/client/js/components/statement/DpStatementAnonymize.vue
+++ b/client/js/components/statement/DpStatementAnonymize.vue
@@ -24,6 +24,7 @@
         id="r_anonymize_statement_meta"
         v-model="actions.anonymizeStatementMeta"
         :class="{'u-mb-0_5': !actions.anonymizeStatementMeta}"
+        data-cy="statementAnonymize:meta"
         :label="{
           hint: Translator.trans('statement.anonymize.meta.hint'),
           text: Translator.trans('statement.anonymize.meta.label')
@@ -40,9 +41,11 @@
       </ul>
 
       <dp-checkbox
+        v-if="hasPermission('feature_statement_text_history_delete')"
         id="r_delete_statement_text_history"
         v-model="actions.deleteStatementTextHistory"
         class="u-mb-0_5"
+        data-cy="statementAnonymize:history"
         :label="{
           hint: Translator.trans('statement.anonymize.delete.history.hint'),
           text: Translator.trans('statement.anonymize.delete.history.label')
@@ -52,6 +55,7 @@
         id="r_anonymize_statement_text"
         v-model="actions.anonymizeStatementText"
         :class="{'u-mb-0_5': !actions.anonymizeStatementText}"
+        data-cy="statementAnonymize:text"
         :label="{
           hint: Translator.trans('statement.anonymize.text.hint'),
           text: Translator.trans('statement.anonymize.text.label')
@@ -75,6 +79,7 @@
         id="r_delete_statement_attachments"
         v-model="actions.deleteStatementAttachments"
         class="u-mb-0_5"
+        data-cy="statementAnonymize:deleteAttachments"
         :label="{
           hint: Translator.trans('statement.anonymize.delete.attachments.hint'),
           text: Translator.trans('statement.anonymize.delete.attachments.label')
@@ -83,6 +88,7 @@
       <div class="flow-root">
         <dp-button
           color="secondary"
+          data-cy="statementAnonymize:backToOriginalStatements"
           :href="Routing.generate('dplan_assessmenttable_view_original_table', {
             procedureId: procedureId,
             filterHash: originalFilterHash
@@ -90,6 +96,7 @@
           :text="Translator.trans('back.to.statements.original')" />
         <dp-button
           class="float-right"
+          data-cy="statementAnonymize:next"
           :disabled="isInvalid()"
           icon-after="chevron-right"
           :text="Translator.trans('continue.confirm')"
@@ -136,12 +143,14 @@
       <div class="flow-root">
         <dp-button
           color="secondary"
+          data-cy="statementAnonymize:back"
           icon="chevron-left"
           :text="Translator.trans('bulk.edit.actions.edit')"
           @click="back" />
         <dp-button
-          class="float-right"
           :busy="busy"
+          class="float-right"
+          data-cy="statementAnonymize:submit"
           icon-after="chevron-right"
           :text="Translator.trans('bulk.edit.actions.apply')"
           @click="submit" />
@@ -220,6 +229,7 @@
 
       <div class="flow-root">
         <dp-button
+          data-cy="statementAnonymize:backToOriginalStatements"
           :href="Routing.generate('dplan_assessmenttable_view_original_table', {
             procedureId: procedureId,
             filterHash: originalFilterHash
diff --git a/client/js/components/statement/publicStatementModal/StatementModalRecheck.vue b/client/js/components/statement/publicStatementModal/StatementModalRecheck.vue
index 988948eec2..a95ee2b1df 100644
--- a/client/js/components/statement/publicStatementModal/StatementModalRecheck.vue
+++ b/client/js/components/statement/publicStatementModal/StatementModalRecheck.vue
@@ -120,8 +120,10 @@
      --><span
           v-if="(fieldIsActive('streetAndHouseNumber') || fieldIsActive('street')) && hasPermission('field_statement_meta_street')"
           :class="prefixClass('layout__item u-1-of-4-desk-up')">
-          <em>{{ Translator.trans('street') }}: </em> {{ statement.r_street }}<br>
-          <template v-if="fieldIsActive('streetAndHouseNumber')">
+          <template v-if="showStreet">
+            <em>{{ Translator.trans('street') }}: </em> {{ statement.r_street }}<br>
+          </template>
+          <template v-if="fieldIsActive('streetAndHouseNumber') && showHouseNumber">
             <em>{{ Translator.trans('street.number.short') }}: </em> {{ statement.r_houseNumber }}<br>
           </template>
         </span><!--
@@ -287,8 +289,16 @@ export default {
       return this.statement.r_email && this.statement.r_email !== ''
     },
 
+    showHouseNumber () {
+      return this.statement.r_houseNumber && this.statement.r_houseNumber !== ''
+    },
+
     showPostalCode () {
       return hasPermission('field_statement_meta_postal_code') && this.statement.r_postalCode && this.statement.r_postalCode !== ''
+    },
+
+    showStreet () {
+      return this.statement.r_street && this.statement.r_street !== ''
     }
   },
 
diff --git a/demosplan/DemosPlanCoreBundle/Controller/Procedure/DemosPlanProcedureController.php b/demosplan/DemosPlanCoreBundle/Controller/Procedure/DemosPlanProcedureController.php
index c0385e4228..ed890255a6 100644
--- a/demosplan/DemosPlanCoreBundle/Controller/Procedure/DemosPlanProcedureController.php
+++ b/demosplan/DemosPlanCoreBundle/Controller/Procedure/DemosPlanProcedureController.php
@@ -50,6 +50,7 @@
 use demosplan\DemosPlanCoreBundle\Logic\Export\EntityPreparator;
 use demosplan\DemosPlanCoreBundle\Logic\FileUploadService;
 use demosplan\DemosPlanCoreBundle\Logic\MailService;
+use demosplan\DemosPlanCoreBundle\Logic\Map\CoordinateJsonConverter;
 use demosplan\DemosPlanCoreBundle\Logic\Map\MapService;
 use demosplan\DemosPlanCoreBundle\Logic\MessageSerializable;
 use demosplan\DemosPlanCoreBundle\Logic\News\ProcedureNewsService;
@@ -152,7 +153,7 @@ public function __construct(
         ProcedureService $procedureService,
         ProcedureServiceOutput $procedureServiceOutput,
         private readonly ProcedureTypeResourceType $procedureTypeResourceType,
-        private readonly SortMethodFactory $sortMethodFactory
+        private readonly SortMethodFactory $sortMethodFactory,
     ) {
         $this->procedureServiceOutput = $procedureServiceOutput;
         $this->procedureService = $procedureService;
@@ -229,7 +230,7 @@ public function procedureDashboardAction(
         StatementService $statementService,
         SurveyService $surveyService,
         TranslatorInterface $translator,
-        string $procedure
+        string $procedure,
     ) {
         $templateVars = [];
         $procedureId = $procedure;
@@ -402,7 +403,7 @@ protected function getStatementStatusData(
         array $statementStatuses,
         array $statementPriorities,
         StatementService $statementService,
-        string $procedureId
+        string $procedureId,
     ): ?array {
         $priorityInitialValues = [];
         foreach ($statementPriorities as $key => $label) {
@@ -484,7 +485,7 @@ protected function getStatementStatusData(
     public function generateAssessmentTableFilterLinkFromStatus(
         string $statusLabel,
         string $procedureId,
-        string $type
+        string $type,
     ): string {
         $filterArray = [];
         // First, the status is transformed into the right format for the following method.
@@ -719,7 +720,7 @@ public function newProcedureAction(
         MasterTemplateService $masterTemplateService,
         Request $request,
         ServiceStorage $serviceStorage,
-        TranslatorInterface $translator
+        TranslatorInterface $translator,
     ) {
         $templateVars = [];
         // Reichere die breadcrumb mit zusätzl. items an
@@ -820,7 +821,7 @@ public function newProcedureTemplateAction(
         MasterTemplateService $masterTemplateService,
         Request $request,
         ServiceStorage $serviceStorage,
-        TranslatorInterface $translator
+        TranslatorInterface $translator,
     ) {
         $templateVars = [];
         // Reichere die breadcrumb mit zusätzl. items an
@@ -923,7 +924,7 @@ public function administrationNewMemberListMastertoeblistAction(
         MasterToebService $masterToebService,
         Request $request,
         ServiceStorage $serviceStorage,
-        $procedure
+        $procedure,
     ) {
         // Storage initialisieren
         $requestPost = $request->request->all();
@@ -984,7 +985,7 @@ public function administrationUnregisteredPublicAgencyEMailAction(
         AddressBookEntryService $addressBookEntryService,
         Request $request,
         TranslatorInterface $translator,
-        $procedureId
+        $procedureId,
     ): Response {
         $procedureService = $this->procedureService;
         $procedure = $procedureService->getProcedure($procedureId);
@@ -1057,7 +1058,7 @@ public function administrationUnregisteredPublicAgencyListAction(
         AddressBookEntryService $addressBookEntryService,
         CurrentUserService $currentUserService,
         Request $request,
-        string $procedureId
+        string $procedureId,
     ): Response {
         $orgaId = $currentUserService->getUser()->getOrganisationId() ?? '';
 
@@ -1105,7 +1106,7 @@ public function administrationMemberEMailAction(
         OrgaService $orgaService,
         Request $request,
         string $procedureId,
-        string $title = 'email.invitation.write'
+        string $title = 'email.invitation.write',
     ): Response {
         $requestPost = $request->request->all();
         $selectedOrganisations = [];
@@ -1225,7 +1226,7 @@ public function administrationEditAction(
         StatementService $statementService,
         TranslatorInterface $translator,
         string $procedure,
-        bool $isMaster = false
+        bool $isMaster = false,
     ) {
         try {
             $procedureId = $procedure;
@@ -1469,7 +1470,7 @@ public function administrationEditAjaxAction(
         FileUploadService $fileUploadService,
         Request $request,
         ServiceStorage $serviceStorage,
-        $procedure
+        $procedure,
     ) {
         $currentProcedure = $currentProcedureService->getProcedureArray();
         $storageResult = [];
@@ -1504,7 +1505,7 @@ public function administrationImportAction(
         PermissionsInterface $permissions,
         ProcedureService $procedureService,
         StatementService $statementService,
-        string $procedureId
+        string $procedureId,
     ): Response {
         $currentUserId = $currentUser->getUser()->getId();
         $templateVars = [
@@ -1625,7 +1626,8 @@ public function publicDetailAction(
         StatementService $statementService,
         SurveyShowHandler $surveyShowHandler,
         StatementSubmissionNotifier $statementSubmissionNotifier,
-        string $procedure
+        CoordinateJsonConverter $coordinateJsonConverter,
+        string $procedure,
     ) {
         // @improve T14613
         $procedureId = $procedure;
@@ -1733,6 +1735,7 @@ public function publicDetailAction(
 
         $currentProcedure = $currentProcedureService->getProcedureArray();
         $templateVars['procedureSettings'] = $currentProcedure['settings'];
+        $templateVars['procedureSettings']['territory'] = $coordinateJsonConverter->convertJsonToCoordinates($currentProcedure['settings']['territory']);
         // Globale Sachdatenabfrage hinzufügen
         $templateVars['procedureSettings']['featureInfoUrl'] = $getFeatureInfo->getUrl();
 
@@ -2069,7 +2072,7 @@ public function administrationMemberListAction(
         StatementService $statementService,
         ServiceStorage $serviceStorage,
         TranslatorInterface $translator,
-        $procedure
+        $procedure,
     ) {
         // Storage und Output initialisieren
         $serviceOutput = $this->procedureServiceOutput;
@@ -2273,7 +2276,7 @@ public function administrationNewMemberListAction(
         Request $request,
         ServiceStorage $serviceStorage,
         TranslatorInterface $translator,
-        string $procedure
+        string $procedure,
     ) {
         $templateVars = [];
         $requestPost = $request->request->all();
@@ -2343,7 +2346,7 @@ public function administrationNewMemberListAction(
     public function boilerplateListAction(
         ProcedureHandler $procedureHandler,
         Request $request,
-        $procedure
+        $procedure,
     ) {
         $procedureId = $procedure;
         $requestPost = $request->request;
@@ -2685,7 +2688,7 @@ protected function handleDeleteBoilerplate(string $boilerplateId)
      * @throws MessageBagException
      */
     protected function handleDeleteBoilerplateGroup(
-        string $boilerplateGroupId
+        string $boilerplateGroupId,
     ) {
         $boilerplatesOfGroupToDelete = new ArrayCollection();
         $boilerplateGroupToDelete = $this->procedureService->getBoilerplateGroup($boilerplateGroupId);
@@ -2720,7 +2723,7 @@ protected function handleDeleteBoilerplateGroup(
      */
     protected function handleDeleteBoilerplates(
         ProcedureHandler $procedureHandler,
-        array $boilerplateIds
+        array $boilerplateIds,
     ) {
         $storageResult = $procedureHandler->deleteBoilerplates($boilerplateIds);
         if (true === $storageResult) {
@@ -2736,7 +2739,7 @@ protected function handleDeleteBoilerplates(
      * @throws MessageBagException
      */
     protected function handleDeleteBoilerplateGroups(
-        array $boilerplateGroupIds
+        array $boilerplateGroupIds,
     ) {
         $boilerplatesOfGroupsToDelete = new ArrayCollection();
         foreach ($boilerplateGroupIds as $boilerplateGroupId) {
@@ -2768,7 +2771,7 @@ protected function handleDeleteBoilerplateGroups(
      */
     protected function addProcedureTypesToTemplateVars(
         array $templateVars,
-        bool $isProcedureTemplate
+        bool $isProcedureTemplate,
     ): array {
         // procedure types are completely irrelevant in procedure templates (Blaupausen), so no need
         // to pass the variable if it's a procedure template (Blaupause)
diff --git a/demosplan/DemosPlanCoreBundle/EventListener/SetHttpTestPermissionsListener.php b/demosplan/DemosPlanCoreBundle/EventListener/SetHttpTestPermissionsListener.php
index 0d5b0c79e3..44a7168c89 100644
--- a/demosplan/DemosPlanCoreBundle/EventListener/SetHttpTestPermissionsListener.php
+++ b/demosplan/DemosPlanCoreBundle/EventListener/SetHttpTestPermissionsListener.php
@@ -15,6 +15,7 @@
 use DemosEurope\DemosplanAddon\Contracts\PermissionsInterface;
 use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
 use Symfony\Component\HttpKernel\Event\ControllerEvent;
+use Symfony\Component\HttpKernel\KernelInterface;
 
 #[AsEventListener(event: 'kernel.controller', priority: 5)]
 class SetHttpTestPermissionsListener
@@ -22,12 +23,17 @@ class SetHttpTestPermissionsListener
     public const X_DPLAN_TEST_PERMISSIONS = 'x-dplan-test-permissions';
 
     public function __construct(
+        private readonly KernelInterface $kernel,
         private readonly PermissionsInterface $permissions,
     ) {
     }
 
     public function onKernelController(ControllerEvent $controllerEvent): void
     {
+        if ($this->kernel->getEnvironment() !== 'test') {
+            return;
+        }
+
         $request = $controllerEvent->getRequest();
         if ($request->server->has(self::X_DPLAN_TEST_PERMISSIONS)) {
             $permissions = $request->server->get(self::X_DPLAN_TEST_PERMISSIONS);
diff --git a/demosplan/DemosPlanCoreBundle/Logic/Map/CoordinateJsonConverter.php b/demosplan/DemosPlanCoreBundle/Logic/Map/CoordinateJsonConverter.php
new file mode 100644
index 0000000000..ac9725f46b
--- /dev/null
+++ b/demosplan/DemosPlanCoreBundle/Logic/Map/CoordinateJsonConverter.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * This file is part of the package demosplan.
+ *
+ * (c) 2010-present DEMOS plan GmbH, for more information see the license file.
+ *
+ * All rights reserved
+ */
+
+namespace demosplan\DemosPlanCoreBundle\Logic\Map;
+
+use DemosEurope\DemosplanAddon\Utilities\Json;
+
+class CoordinateJsonConverter
+{
+    public function convertCoordinatesToJson(?array $coordinates): string
+    {
+        return null === $coordinates ? '' : Json::encode($coordinates, JSON_FORCE_OBJECT);
+    }
+
+    public function convertJsonToCoordinates(string $rawCoordinateValues): ?array
+    {
+        return '' === $rawCoordinateValues ? null : Json::decodeToArray($rawCoordinateValues);
+    }
+}
diff --git a/demosplan/DemosPlanCoreBundle/ResourceTypes/ProcedureMapSettingResourceType.php b/demosplan/DemosPlanCoreBundle/ResourceTypes/ProcedureMapSettingResourceType.php
index b616419df8..cdc4c2a69d 100644
--- a/demosplan/DemosPlanCoreBundle/ResourceTypes/ProcedureMapSettingResourceType.php
+++ b/demosplan/DemosPlanCoreBundle/ResourceTypes/ProcedureMapSettingResourceType.php
@@ -13,11 +13,11 @@
 namespace demosplan\DemosPlanCoreBundle\ResourceTypes;
 
 use DemosEurope\DemosplanAddon\EntityPath\Paths;
-use DemosEurope\DemosplanAddon\Utilities\Json;
 use demosplan\DemosPlanCoreBundle\Entity\Procedure\ProcedureSettings;
 use demosplan\DemosPlanCoreBundle\Entity\Setting;
 use demosplan\DemosPlanCoreBundle\Logic\ApiRequest\ResourceType\DplanResourceType;
 use demosplan\DemosPlanCoreBundle\Logic\ContentService;
+use demosplan\DemosPlanCoreBundle\Logic\Map\CoordinateJsonConverter;
 use demosplan\DemosPlanCoreBundle\Logic\Map\MapService;
 use demosplan\DemosPlanCoreBundle\Logic\Procedure\MasterTemplateService;
 use demosplan\DemosPlanCoreBundle\ResourceConfigBuilder\ProcedureMapSettingResourceConfigBuilder;
@@ -33,7 +33,8 @@ class ProcedureMapSettingResourceType extends DplanResourceType
 {
     public function __construct(
         protected readonly ContentService $contentService,
-        protected readonly MasterTemplateService $masterTemplateService
+        protected readonly MasterTemplateService $masterTemplateService,
+        protected readonly CoordinateJsonConverter $coordinateJsonConverter,
     ) {
     }
 
@@ -162,11 +163,11 @@ protected function getProperties(): ResourceConfigBuilderInterface
         if ($this->currentUser->hasPermission('feature_map_use_territory')) {
             $configBuilder->territory
                 ->updatable([], function (ProcedureSettings $procedureSettings, array $territory): array {
-                    $procedureSettings->setTerritory($this->convertCoordinatesToJson($territory));
+                    $procedureSettings->setTerritory($this->coordinateJsonConverter->convertCoordinatesToJson($territory));
 
                     return [];
                 })
-                ->readable(false, fn (ProcedureSettings $procedureSettings): ?array => $this->convertJsonToCoordinates($procedureSettings->getTerritory()));
+                ->readable(false, fn (ProcedureSettings $procedureSettings): ?array => $this->coordinateJsonConverter->convertJsonToCoordinates($procedureSettings->getTerritory()));
         }
 
         $configBuilder->defaultBoundingBox
@@ -278,16 +279,6 @@ protected function convertFlatListToCoordinates(string $rawCoordinateValues, boo
         ];
     }
 
-    protected function convertCoordinatesToJson(?array $coordinates): string
-    {
-        return null === $coordinates ? '' : Json::encode($coordinates, JSON_FORCE_OBJECT);
-    }
-
-    protected function convertJsonToCoordinates(string $rawCoordinateValues): ?array
-    {
-        return '' === $rawCoordinateValues ? null : Json::decodeToArray($rawCoordinateValues);
-    }
-
     /**
      * @return list<int>
      */
diff --git a/package.json b/package.json
index 2eeb279eee..3bcf90f0b5 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "lint:scss": "stylelint {demosplan/DemosPlanCoreBundle/Resources/client/scss,projects}/**/*.scss"
   },
   "dependencies": {
-    "@demos-europe/demosplan-ui": "0.3.30",
+    "@demos-europe/demosplan-ui": "0.3.31",
     "@demos-europe/dp-consent": "^1.3",
     "@efrane/vuex-json-api": "^0.1.2",
     "@masterportal/masterportalapi": "2.22.0",
diff --git a/templates/bundles/DemosPlanCoreBundle/DemosPlanNews/public_newsdetail.html.twig b/templates/bundles/DemosPlanCoreBundle/DemosPlanNews/public_newsdetail.html.twig
index be51e79799..b180913fd9 100644
--- a/templates/bundles/DemosPlanCoreBundle/DemosPlanNews/public_newsdetail.html.twig
+++ b/templates/bundles/DemosPlanCoreBundle/DemosPlanNews/public_newsdetail.html.twig
@@ -41,7 +41,7 @@
                     <a
                         target="_blank"
                         rel="noopener"
-                        href="{{ path("core_file", { 'hash': news.pdf|getFile('hash') }) }}">
+                        href="{{ path("core_file_procedure", { 'procedureId': procedure, 'hash': news.pdf|getFile('hash') }) }}">
                         {{ news.pdftitle|default(news.pdf|getFile('name')) }}
                         {% if(news.pdf|getFile('size')|length > 0 or news.pdf|getFile('mimeType')|length > 0 ) %}
                             ({{ news.pdf|getFile('size') }} {{ news.pdf|getFile('mimeType') }})
diff --git a/templates/bundles/DemosPlanCoreBundle/DemosPlanProcedure/public_detail.html.twig b/templates/bundles/DemosPlanCoreBundle/DemosPlanProcedure/public_detail.html.twig
index 0c0ade4188..611bdfdb5c 100644
--- a/templates/bundles/DemosPlanCoreBundle/DemosPlanProcedure/public_detail.html.twig
+++ b/templates/bundles/DemosPlanCoreBundle/DemosPlanProcedure/public_detail.html.twig
@@ -25,11 +25,7 @@
 {% endif %}
 
 {# Selbiges gilt für den Geltungsbereich #}
-{#
- territory is now saved as geojson, so an empty territory is
- {"type":"FeatureCollection","features":[]} == 42 chars
-#}
-{% if procedureSettings.territory|default|length > 42 %}
+{% if procedureSettings.territory is defined and procedureSettings.territory.features|default|length > 0 %}
     {% set hasTerritory = true %}
 {% endif %}
 
diff --git a/tests/backend/core/Core/Functional/SetTestPermissionsListenerTest.php b/tests/backend/core/Core/Functional/SetTestPermissionsListenerTest.php
index af680b2d72..8d95f8ab4b 100644
--- a/tests/backend/core/Core/Functional/SetTestPermissionsListenerTest.php
+++ b/tests/backend/core/Core/Functional/SetTestPermissionsListenerTest.php
@@ -33,7 +33,7 @@ public function testOnKernelController(array $inputPermissions, array $expectedP
             ->with($this->equalTo($expectedPermissions));
 
         // Create an instance of SetHttpTestPermissionsListener
-        $listener = new SetHttpTestPermissionsListener($permissions);
+        $listener = new SetHttpTestPermissionsListener(static::$kernel, $permissions);
 
         // Create a mock request
         $request = new Request();
diff --git a/yarn.lock b/yarn.lock
index b2e078c279..0620df40eb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1963,9 +1963,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@demos-europe/demosplan-ui@npm:0.3.30":
-  version: 0.3.30
-  resolution: "@demos-europe/demosplan-ui@npm:0.3.30"
+"@demos-europe/demosplan-ui@npm:0.3.31":
+  version: 0.3.31
+  resolution: "@demos-europe/demosplan-ui@npm:0.3.31"
   dependencies:
     "@braintree/sanitize-url": "npm:^7.0.0"
     "@floating-ui/dom": "npm:^1.4.5"
@@ -2040,7 +2040,7 @@ __metadata:
       optional: true
     prosemirror-view:
       optional: true
-  checksum: 10c0/df838666b89f2e28d35e260513fb14767935cf5871483f911ce66888e0561afdcfce7856ab8f3a099f78bd46a84058f0ba41d06d615d31f1fd98a05329767777
+  checksum: 10c0/8fab5f53b4df1618749b4bec3ba06dcc5122f23c7cb476778167ea02159347f1bdd3d58c0b1ee48fe19f9806f4885a29e63b58b377427b21506d4c76e291de29
   languageName: node
   linkType: hard
 
@@ -2881,15 +2881,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tiptap/extension-bubble-menu@npm:^2.4.0":
-  version: 2.4.0
-  resolution: "@tiptap/extension-bubble-menu@npm:2.4.0"
+"@tiptap/extension-bubble-menu@npm:^2.6.6":
+  version: 2.6.6
+  resolution: "@tiptap/extension-bubble-menu@npm:2.6.6"
   dependencies:
     tippy.js: "npm:^6.3.7"
   peerDependencies:
-    "@tiptap/core": ^2.0.0
-    "@tiptap/pm": ^2.0.0
-  checksum: 10c0/9e5e48b92c690f08334d8c68ee645b2c115f07511d97cb51c3292289557a1d9e347a7f2e3c77b09532718a702e25d994ebe396554597143f1934c1b0209982e7
+    "@tiptap/core": ^2.6.6
+    "@tiptap/pm": ^2.6.6
+  checksum: 10c0/4a00b73d133a90bc9baf977da352ced971eeba3930a3e34ddc14bfbb0f7742d07f7087a8ec35b700ff64b2a21bf601a55bd96dcee28c9bdf9d2dd79d545d2a64
   languageName: node
   linkType: hard
 
@@ -2911,15 +2911,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tiptap/extension-floating-menu@npm:^2.4.0":
-  version: 2.4.0
-  resolution: "@tiptap/extension-floating-menu@npm:2.4.0"
+"@tiptap/extension-floating-menu@npm:^2.6.6":
+  version: 2.6.6
+  resolution: "@tiptap/extension-floating-menu@npm:2.6.6"
   dependencies:
     tippy.js: "npm:^6.3.7"
   peerDependencies:
-    "@tiptap/core": ^2.0.0
-    "@tiptap/pm": ^2.0.0
-  checksum: 10c0/60f31277ecc116a0fc1015834ecf08204995c182dc8ad0dd2854b4b6ec57208a665d2270e459df082d070f82bfbc1968bad0f6fcb386ca9048920a5aa7ccd83a
+    "@tiptap/core": ^2.6.6
+    "@tiptap/pm": ^2.6.6
+  checksum: 10c0/0184135d57f195e34f968645bb4c445bc089e8ac88886b3fed08500767b4f4cf2a5ac6d0d43735ddf13ed7c0eb44f4f179469f3b784edd63cca748ce46c7a55d
   languageName: node
   linkType: hard
 
@@ -3111,17 +3111,17 @@ __metadata:
   linkType: hard
 
 "@tiptap/vue-2@npm:^2.0.3":
-  version: 2.4.0
-  resolution: "@tiptap/vue-2@npm:2.4.0"
+  version: 2.6.6
+  resolution: "@tiptap/vue-2@npm:2.6.6"
   dependencies:
-    "@tiptap/extension-bubble-menu": "npm:^2.4.0"
-    "@tiptap/extension-floating-menu": "npm:^2.4.0"
+    "@tiptap/extension-bubble-menu": "npm:^2.6.6"
+    "@tiptap/extension-floating-menu": "npm:^2.6.6"
     vue-ts-types: "npm:^1.6.0"
   peerDependencies:
-    "@tiptap/core": ^2.0.0
-    "@tiptap/pm": ^2.0.0
+    "@tiptap/core": ^2.6.6
+    "@tiptap/pm": ^2.6.6
     vue: ^2.6.0
-  checksum: 10c0/9a0b2b7dd9d657d83a312342926f2fb6de40edfc38fa78c10fd27df1e2bbaa5a114ac3bc115cda58552be9beeddb0f565e375ddbfcb07fac27870aade3cc5307
+  checksum: 10c0/252513fac842b38839eb4bfcaeefa92083133e5c49ae1b23740a78d43cc47d7b43ba0a6d172c9e4f13dedc8e4c800f6bcbba1545b1ccd52a953fb4234595681f
   languageName: node
   linkType: hard
 
@@ -11738,7 +11738,7 @@ __metadata:
     "@babel/plugin-transform-runtime": "npm:^7.24.7"
     "@babel/preset-env": "npm:^7.24.8"
     "@babel/runtime": "npm:^7.24.8"
-    "@demos-europe/demosplan-ui": "npm:0.3.30"
+    "@demos-europe/demosplan-ui": "npm:0.3.31"
     "@demos-europe/dp-consent": "npm:^1.3"
     "@efrane/vuex-json-api": "npm:^0.1.2"
     "@fullhuman/postcss-purgecss": "npm:^6.0.0"