diff --git a/Layout/default/Contract/Form.php b/Layout/default/Contract/Form.php
index 9ec068aef..5434a08d2 100644
--- a/Layout/default/Contract/Form.php
+++ b/Layout/default/Contract/Form.php
@@ -200,7 +200,6 @@
                       <th>Kunde</th>
                       <th>Contract ID</th>
                       <th>Produkt</th>
-                      <th>Matchcode</th>
                       <th></th>
                     </tr>
                     <?php foreach($contract->links as $link): ?>
@@ -208,8 +207,7 @@
                         <td><?=__($link->type, "contract")?></td>
                         <td><a href="<?=self::getUrl("Address", "View", ["id" => $link->contract->owner_id])?>"><?=$link->contract->owner->getCompanyOrName()?></a></td>
                         <td><a href="<?=self::getUrl("Contract", "View", ["id" => $link->contract_id])?>"><?=$link->contract_id?></a></td>
-                        <td><a href="<?=self::getUrl("Contract", "View", ["id" => $link->contract_id])?>"><?=$link->contract->product->name?></a></td>
-                        <td><a href="<?=self::getUrl("Contract", "View", ["id" => $link->contract_id])?>"><?=$link->contract->matchcode?></a></td>
+                        <td><a href="<?=self::getUrl("Contract", "View", ["id" => $link->contract_id])?>"><?=$link->contract->product->name?> [<?=$link->contract->matchcode?>]</a></td>
                         <td>
                           <a href="<?=self::getUrl("Contract", "deleteLink", ["link_id" => $link->id])?>" onclick="if(!confirm('Verknüpfung wirklich entfernen?')) return false;" class="text-danger" title="Verknüpfung entfernen"><i class="fas fa-xmark-large"></i></a>
                         </td>
diff --git a/Layout/default/Contract/Index.php b/Layout/default/Contract/Index.php
index 7613983c3..63ed7c126 100644
--- a/Layout/default/Contract/Index.php
+++ b/Layout/default/Contract/Index.php
@@ -109,7 +109,7 @@
               <?php foreach($contracts as $contract): ?>
               <tr>
                 <td><a href="<?=self::getUrl("Contract", "view", ["contract_id" => $contract->id])?>"><?=$contract->id?></a></td>
-                <td><a href="<?=self::getUrl("Address", "View", ["id" => $contract->owner_id])?>" target="_blank"><i class="far fa-eyes" title="Kunde in neuem Tab anzeigen"></i></a> <?=$contract->owner->getCompanyOrName()?></td>
+                <td><a href="<?=self::getUrl("Address", "View", ["id" => $contract->owner_id])?>" target="_blank"><i class="far fa-eyes" title="Kunde in neuem Tab anzeigen"></i></a> <?=$contract->owner->getCompanyOrName()?> (<?=$contract->owner->customer_number?>)</td>
                 <td><a href="<?=self::getUrl("Contract", "view", ["contract_id" => $contract->id])?>"><?=$contract->product_name?></a></td>
                 <td><a href="<?=self::getUrl("Contract", "view", ["contract_id" => $contract->id])?>"><?=$contract->matchcode?></a></td>
                 <!--<td>
diff --git a/Layout/default/Contract/View.php b/Layout/default/Contract/View.php
index 729135eb5..44e1aec7b 100644
--- a/Layout/default/Contract/View.php
+++ b/Layout/default/Contract/View.php
@@ -322,7 +322,6 @@
                 <th>Contract ID</th>
                 <th>Typ</th>
                 <th>Produkt</th>
-                <th>Matchcode</th>
                 <th>Bestelldatum</th>
                 <th>Fertigstellung</th>
                 <th>Kündigung</th>
@@ -350,8 +349,7 @@
                 <td><a href="<?=self::getUrl("Address", "View", ["id" => $linkcontract->owner_id])?>"><?=$linkcontract->owner->getCompanyOrName()?></a></td>
                 <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><a href="<?=self::getUrl("Contract", "View", ["contract_id" => $linkcontract->id])?>"><?=$linkcontract->id?></a></td>
                 <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><?=__($link->type, "contract")?> <?=($link->type != "link") ? $direction : ""?></td>
-                <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><a href="<?=self::getUrl("Contract", "View", ["contract_id" => $linkcontract->id])?>"><?=$linkcontract->product_name?></a></td>
-                <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><a href="<?=self::getUrl("Contract", "View", ["contract_id" => $linkcontract->id])?>"><?=$linkcontract->matchcode?></a></td>
+                <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><a href="<?=self::getUrl("Contract", "View", ["contract_id" => $linkcontract->id])?>"><?=$linkcontract->product_name?> [<?=$linkcontract->matchcode?>]</a></td>
                 <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><?=($linkcontract->order_date) ? date('d.m.Y', $linkcontract->order_date) : ""?></td>
                 <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><?=($linkcontract->finish_date) ? date('d.m.Y', $linkcontract->finish_date) : ""?></td>
                 <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><?=($linkcontract->cancel_date) ? date('d.m.Y', $linkcontract->cancel_date) : ""?></td>
diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php
index 0cb4001ab..3c92ca175 100644
--- a/Layout/default/Preorder/Index.php
+++ b/Layout/default/Preorder/Index.php
@@ -128,6 +128,22 @@
             
           </div>
         </div>
+        
+        <?php if($me->is("Admin")): ?>
+        <div class="card">
+          <div class="card-body">
+            <div class="row col" id="map-link">
+              <a href="#" class="btn btn-success" onclick="refreshMap()"><i class="far fa-map"></i> Übersichtskarte einblenden</a>
+            </div>
+            <div class="row hidden" id="map-row">
+              <div id="preorder-map" style="height:70vh; width: 100%"></div>
+              <div class="mt-1">
+                <button type="button" class="btn btn-sm btn-outline-secondary" onclick="centerMap()"><i class="far fa-dot-circle"></i> Zentrieren</button>
+              </div>
+            </div>
+          </div>
+        </div>
+        <?php endif; ?>
 
         
         <div class="card">
@@ -233,12 +249,9 @@
         attributes.forEach(function(attrib) {
           $("input[name=attributes_" + attrib + "]").change(function(ev) {
             // save new value
-            //console.log(ev);
             var cb = $("#" + ev.currentTarget.id);
-            //console.log($(cb).is(":checked"));
             var value = $(cb).is(":checked") ? 1 : 0;
             var preorder_id = $(cb).data("preorder-id");
-            //console.log(preorder_id);
             
             $.post("<?=self::getUrl("Preorder", "Api")?>", {
                 do: "saveAttribute",
@@ -282,5 +295,146 @@
         $("#attributes_" + attribute + "-" + id).prop("checked", !$("#attributes_" + attribute + "-" + id).is(":checked"));
       }
      
+     
+     
+      /*
+      * Globals for map display
+      */
+
+      var preorderMap;
+      var preorders = [];
+      var markers = [];
+      var markerState = true;
+      var mapCenterPos = [<?=TT_PLACEHOLDER_GPS_LAT?>, <?=TT_PLACEHOLDER_GPS_LONG?>];
+      
+      function refreshMap() {
+        // get Preorders and render map
+        $('#map-link').hide();
+        $('#map-row').show();
+        getMapdata();
+        $([document.documentElement, document.body]).animate({
+          scrollTop: $("#preorder-map").offset().top - 150
+        }, 500);
+      }
+
+      function renderMap() {
+        if(preorderMap) {
+          markers.forEach(function(m) {
+            preorderMap.removeLayer(m);
+          });
+        } else {
+          preorderMap = L.map('preorder-map').setView([<?=TT_PLACEHOLDER_GPS_LAT?>, <?=TT_PLACEHOLDER_GPS_LONG?>], 12);
+        }
+        
+        L.tileLayer('https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token={accessToken}', {
+          attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="https://www.mapbox.com/">Mapbox</a>',
+          minZoom: 4,
+          maxZoom: 22,
+          id: 'mapbox/streets-v11',
+          accessToken: '<?=TT_MAPBOX_TILE_API_TOKEN?>'
+        }).addTo(preorderMap);
+
+        L.MakiMarkers.accessToken = '<?=TT_MAPBOX_TILE_API_TOKEN?>';
+
+        addMarkers();
+      }
+
+
+
+      function addMarkers() {
+        if(!Array.isArray(preorders) | !preorders.length) {
+          return false;
+        }
+        // draw markers and calculate center position
+        var all_coords = [];
+        preorders.forEach(function(preorder) {
+          if(!preorder.gps_lat || !preorder.gps_long) {
+            return;
+          }
+          var gps = [preorder.gps_lat, preorder.gps_long];
+          all_coords.push(gps);
+
+          var icon_color = "#2AAD27";
+          var icon_name = "home";
+
+          if(preorder.type == "interest") {
+            icon_color = "#CB2B3E";
+          } else if(preorder.type == "provision") {
+            icon_color = "#CB8427";
+          }
+          
+          if(preorder.connection_type.match(/^multi/i) || preorder.count > 1) {
+            icon_name = "town";
+          } else if(preorder.connection_type.match(/^apartment-building/i)) {
+            icon_name = "city";
+          } else if(preorder.connection_type.match(/^business/i)) {
+            icon_name = "industry";
+          }
+          
+          var marker_popup_content = '<?php include(realpath(dirname(__FILE__))."/include/preorder_popup.php");?>';
+
+          [["street", preorder.adb_strasse], ["hausnummer", preorder.adb_hausnummer], ["zip", preorder.adb_plz], ["city", preorder.adb_ort], ["type", preorder.type_label], ["adrcd", preorder.adrcd], ["extref", preorder.extref], ["gps", preorder.gps_lat + ", " + preorder.gps_long],
+            ["contact", (preorder.company ? preorder.company + " " : preorder.firstname + " " + preorder.lastname)], ["phone", preorder.phone], ["email", preorder.email], ["connectiontype", preorder.connection_type_label], ["count", preorder.connection_count]
+          ].forEach(function(item) {
+            marker_popup_content = marker_popup_content.replaceAll("{{" + item[0].toUpperCase() + "}}", item[1]);
+          });
+
+          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);
+          markers[preorder.id] = marker;
+        });
+
+        
+        // calculate center position
+        mapCenterPos = GetCenterFromDegrees(all_coords);
+        preorderMap.setView(mapCenterPos, 12);
+
+        return true;
+      }
+
+      function centerMap() {
+        preorderMap.setView(mapCenterPos, 12);
+      }
+
+      // gets preorders and calls renderMap()
+      function getMapdata() {
+        filter = getFilter();
+
+        $.post('<?=self::getUrl("Preorder", "Api")?>', {
+          'do': "getFilteredPreorders",
+          filter: filter
+        },function(success) {
+          if(success.status == "OK") {
+
+            if(Array.isArray(success.result.preorders)) {
+              preorders = success.result.preorders;
+              renderMap();
+            }
+          }
+        },
+        'json'
+        );
+
+      }
+
+      function getFilter() {
+        var fields = ['preordercampaign_id', 'status', 'type', 'address', 'kunde', 'address_source'];
+        var filter = {};
+        fields.forEach(function(field) {
+          if(!field) {
+            return;
+          }
+          let val = $('#filter_' + field).val();
+          if(val.length) {
+            filter[field] = val;
+          }
+        });
+
+        return filter;
+      }
+
+      <?php if(is_array($filter) && count($filter)): ?>
+        //refreshMap();
+      <?php endif; ?>
     </script>
 <?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>
diff --git a/Layout/default/Preorder/include/preorder_popup.php b/Layout/default/Preorder/include/preorder_popup.php
new file mode 100644
index 000000000..116978bf8
--- /dev/null
+++ b/Layout/default/Preorder/include/preorder_popup.php
@@ -0,0 +1,42 @@
+<?php
+ob_start();
+?>
+<div class="font-weight-bold">
+  {{STREET}} {{HAUSNUMMER}}<br />
+  {{ZIP}} {{CITY}}
+</div>
+
+<hr />
+
+<table class="table table-sm table-striped">
+  <tr>
+    <th class="font-weight-bold">GWR Adrcd:</th>
+    <td>{{ADRCD}}</td>
+  </tr><tr>
+    <th class="font-weight-bold">Extref:</th>
+    <td>{{EXTREF}}</td>
+  </tr><tr>
+    <th class="font-weight-bold">Gebäudetyp:</th>
+    <td>{{CONNECTIONTYPE}}</td>
+  </tr><tr>
+    <th class="font-weight-bold">Bestelltyp:</th>
+    <td>{{TYPE}}</td>
+  </tr><tr>
+    <th class="font-weight-bold">Anschlüsse:</th>
+    <td>{{COUNT}}</td>
+  </tr><tr>
+    <th class="font-weight-bold">GPS:</th>
+    <td><a href="https://maps.google.com/maps?t=k&q=loc:{{GPS}}" target="_blank">{{GPS}}</a></td>
+  </tr><tr>
+    <th class="font-weight-bold">Kontakt:</th>
+    <td>{{CONTACT}}</td>
+  </tr><tr>
+    <th class="font-weight-bold">Telefon:</th>
+    <td>{{PHONE}}</td>
+  </tr><tr>
+    <th class="font-weight-bold">Email:</th>
+    <td>{{EMAIL}}</td>
+  </tr>
+  
+</table>
+<?=str_replace("\n"," ",ob_get_clean())?>
\ No newline at end of file
diff --git a/application/Contract/Contract.php b/application/Contract/Contract.php
index fc4002b52..7cdda9229 100644
--- a/application/Contract/Contract.php
+++ b/application/Contract/Contract.php
@@ -1,6 +1,8 @@
 <?php
 
 class Contract extends mfBaseModel {
+  protected $forcestr = ["product_name","product_info","matchcode"];
+  
   private $owner;
   private $billingaddress;
   private $product;
diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php
index 28ade91bf..b987fbcf8 100644
--- a/application/Preorder/PreorderController.php
+++ b/application/Preorder/PreorderController.php
@@ -676,6 +676,9 @@ class PreorderController extends mfBaseController {
       case "saveAttribute":
         $return = $this->saveAttributeApi();
         break;
+      case "getFilteredPreorders":
+        $return = $this->getFilteredPreordersApi();
+        break;
       default:
         $return = false;
     }
@@ -689,6 +692,59 @@ class PreorderController extends mfBaseController {
     $this->returnJson($data);
   }
   
+  private function getFilteredPreordersApi() {
+    $preorders = [];
+    $filter = [];
+    if(is_array($this->request->filter)) {
+      $filter = $this->request->filter;
+    }
+    
+    $filter = $this->getPreparedFilter($filter);
+    
+    $my_campaign_ids = [];
+    
+    if($this->me->is("Admin")) {
+      $my_networks = NetworkModel::getAll();
+    } else {
+      $my_networks = $this->me->myNetworks(['netowner','salespartner']);
+    }
+    
+    foreach($my_networks as $network) {
+      foreach(PreordercampaignModel::search(['network_id' => $network->id]) as $campaign) {
+        $my_campaigns[] = $campaign;
+        if(!in_array($campaign->id, $my_campaign_ids)) $my_campaign_ids[] = $campaign->id;
+      }
+    }
+    
+    $filter['preordercampaign_id'] = $my_campaign_ids;
+    
+    
+    $results = PreorderModel::search($filter);
+    
+    foreach($results as $preorder) {
+      //$this->log->debug("building status: ".print_r($building->status,true));
+      $data = clone($preorder->data);
+      $data->id = $preorder->id;
+      $data->status_code = $preorder->status->code;
+      $data->adrcd = $preorder->adb_hausnummer->adrcd;
+      $data->extref = $preorder->adb_hausnummer->extref;
+      $data->adb_strasse = $preorder->adb_hausnummer->strasse->name;
+      $data->adb_hausnummer = $preorder->adb_hausnummer->hausnummer;
+      $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->gps_lat = $preorder->adb_hausnummer->gps_lat;
+      $data->gps_long = $preorder->adb_hausnummer->gps_long;
+      
+      $data->type_label = __($data->type, "preorder");
+      $data->connection_type_label = __($data->connection_type, "preorder");
+      
+      $preorders[] = $data;
+    }
+    
+    return ["preorders" => $preorders];
+  }
+  
   private function saveAttributeApi() {
     $preorder_id = $this->request->id;
     if(!is_numeric($preorder_id) || $preorder_id < 1) {