diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php
index 9fe9a7a8d..39d0c109e 100644
--- a/Layout/default/Preorder/Index.php
+++ b/Layout/default/Preorder/Index.php
@@ -1480,10 +1480,12 @@ $pagination_entity_name = "Vorbestellungen";
                     icon_name = "industry";
                 }
 
-                var marker_popup_content = `<?php include(realpath(dirname(__FILE__))."/include/preorder_popup.php");?>`;
+
 
                 // popup fields
                 const preorder_view_url = `<?=self::getUrl("Preorder")?>/Index?filter[ucode]=${preorder.ucode}#preorder=${preorder.id}`;
+                var marker_popup_content = `<?php include(realpath(dirname(__FILE__))."/include/preorder_popup.php"); ?>`;
+
                 [
                     ["PREORDER_URL", preorder_view_url],
                     ["street", preorder.adb_strasse],
@@ -1504,8 +1506,10 @@ $pagination_entity_name = "Vorbestellungen";
                     marker_popup_content = marker_popup_content.replaceAll("{{" + item[0].toUpperCase() + "}}", item[1]);
                 });
 
+                var tooltip_content = preorder.adb_strasse + " " + preorder.adb_hausnummer + "<br />" + preorder.adb_plz + " " + preorder.adb_ort + "<br /><br />Execution State: " + preorder.adb_ex_state
+                console.log(tooltip_content);
                 var icon = L.MakiMarkers.icon({icon: icon_name, color: icon_color, size: "l"});
-                var marker = L.marker(gps, {icon: icon}).addTo(preorderMap).bindPopup(marker_popup_content);
+                var marker = L.marker(gps, {icon: icon}).bindPopup(marker_popup_content).bindTooltip(tooltip_content).addTo(preorderMap);
                 markers[preorder.id] = marker;
 
                 <?php if($me->is("Admin")): ?>
diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php
index 7486a2772..2047d3515 100644
--- a/application/Preorder/PreorderController.php
+++ b/application/Preorder/PreorderController.php
@@ -1588,6 +1588,8 @@ class PreorderController extends mfBaseController {
                 $data->adb_plz = $preorder->adb_hausnummer->plz->plz;
                 $data->adb_ort = $preorder->adb_hausnummer->ortschaft->name;
                 $data->adb_gemeinde = $preorder->adb_hausnummer->strasse->gemeinde->name;
+                $data->adb_ex_state = $preorder->adb_hausnummer->rimo_ex_state;
+                $data->adb_op_state = $preorder->adb_hausnummer->rimo_op_state;
                 $data->gps_lat = $preorder->adb_hausnummer->gps_lat;
                 $data->gps_long = $preorder->adb_hausnummer->gps_long;