diff --git a/Layout/default/ConstructionConsent/Form.php b/Layout/default/ConstructionConsent/Form.php
index 80d2c0521..3f518f870 100644
--- a/Layout/default/ConstructionConsent/Form.php
+++ b/Layout/default/ConstructionConsent/Form.php
@@ -6,8 +6,10 @@
             <div class="page-title-right">
                 <ol class="breadcrumb m-0">
                     <li class="breadcrumb-item"><a href="<?= self::getUrl("Dashboard") ?>"><?= MFAPPNAME_SLUG ?></a></li>
-                    <li class="breadcrumb-item"><a href="<?= self::getUrl("Preordercampaign") ?>">Zustimmungserklärungen</a></li>
-                    <li class="breadcrumb-item active"><?= ($Action == "add") ? "neu" : "bearbeiten" ?></li>
+                    <li class="breadcrumb-item"><a href="<?=self::getUrl("ConstructionConsentProject")?>">Zustimmungserklärungsprojekte</a></li>
+                    <li class="breadcrumb-item"><a href="<?=self::getUrl("ConstructionConsent")?>">Zustimmungserklärungen</a></li>
+                    <li class="breadcrumb-item"><a href="<?=self::getUrl("ConstructionConsent", "View", ["id" => $item->id])?>"><?=htmlentities($item->name)?></a></li>
+                    <li class="breadcrumb-item active">bearbeiten</li>
                 </ol>
             </div>
             <h4 class="page-title">Zustimmungserklärung</h4>
diff --git a/Layout/default/ConstructionConsent/Index.php b/Layout/default/ConstructionConsent/Index.php
index d49752bfd..437ce156e 100644
--- a/Layout/default/ConstructionConsent/Index.php
+++ b/Layout/default/ConstructionConsent/Index.php
@@ -13,7 +13,8 @@ $pagination_entity_name = "Zustimmungserklärungen";
             <div class="page-title-right">
                 <ol class="breadcrumb m-0">
                     <li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
-                    <li class="breadcrumb-item active">Zustimmmungserklärungen</li>
+                    <li class="breadcrumb-item"><a href="<?=self::getUrl("ConstructionConsentProject")?>">Zustimmungserklärungen</a></li>
+                    <li class="breadcrumb-item active">Übersicht<?=(array_key_exists("project_id", $filter) && $filter["project_id"]) ? " ".$project->name : ""?></li>
                 </ol>
             </div>
             <h4 class="page-title">Zustimmmungserklärungen</h4>
diff --git a/Layout/default/ConstructionConsent/View.php b/Layout/default/ConstructionConsent/View.php
index 28a7c749e..921b49b66 100644
--- a/Layout/default/ConstructionConsent/View.php
+++ b/Layout/default/ConstructionConsent/View.php
@@ -10,7 +10,8 @@ $pagination_entity_name = "Adressen";
                 <div class="page-title-right">
                     <ol class="breadcrumb m-0">
                         <li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
-                        <li class="breadcrumb-item"><a href="<?=self::getUrl("ConstructionConsent")?>">Zustimmungserklärungen</a></li>
+                        <li class="breadcrumb-item"><a href="<?=self::getUrl("ConstructionConsentProject")?>">Zustimmungserklärungsprojekte</a></li>
+                        <li class="breadcrumb-item"><a href="<?=self::getUrl("ConstructionConsent", "Index", ["filter" => ["project_id" => $item->constructionconsentproject_id]])?>">Zustimmungserklärungen <?=$item->project->name?></a></li>
                         <li class="breadcrumb-item active"><?=$item->name?></li>
                     </ol>
                 </div>
diff --git a/Layout/default/ConstructionConsentProject/Index.php b/Layout/default/ConstructionConsentProject/Index.php
index a25755b46..bf9df49a0 100644
--- a/Layout/default/ConstructionConsentProject/Index.php
+++ b/Layout/default/ConstructionConsentProject/Index.php
@@ -13,8 +13,7 @@ $pagination_entity_name = "Zustimmungserklärungsprojekte";
             <div class="page-title-right">
                 <ol class="breadcrumb m-0">
                     <li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
-                    <li class="breadcrumb-item"><a href="<?=self::getUrl("ConstructionConsent")?>">Zustimmmungserklärungen</a></li>
-                    <li class="breadcrumb-item active">Projekte</li>
+                    <li class="breadcrumb-item active">Zustimmungserklärungsprojekte</li>
                 </ol>
             </div>
             <h4 class="page-title">Zustimmmungserklärungen</h4>
diff --git a/application/ConstructionConsentHistory/ConstructionConsentHistory.php b/application/ConstructionConsentHistory/ConstructionConsentHistory.php
index c04d8c816..449a20205 100644
--- a/application/ConstructionConsentHistory/ConstructionConsentHistory.php
+++ b/application/ConstructionConsentHistory/ConstructionConsentHistory.php
@@ -116,7 +116,7 @@ class ConstructionConsentHistory extends mfBaseModel {
         }
 
         if(!is_object($value)) {
-            return $value;
+            return htmlentities($value);
         }
 
         if(get_class($value) == "Preorderstatus") {