diff --git a/Layout/default/Building/Index.php b/Layout/default/Building/Index.php
index f744a5ff9..7d96ab7b6 100644
--- a/Layout/default/Building/Index.php
+++ b/Layout/default/Building/Index.php
@@ -110,9 +110,12 @@
               <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="building-map" style="height:50vh; 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 id="building-map" style="height:70vh; width: 100%"></div>
+              <div class="row mt-1">
+                <div class="col">
+                  <button type="button" class="btn btn-sm btn-outline-secondary" onclick="centerMap()"><i class="far fa-dot-circle fa-fw"></i> Zentrieren</button>
+                  <button type="button" class="btn btn-sm btn-outline-success" onclick="toggleTileset()" title="Zwischen Karte und Satellitenbild umschalten"><i class="far fa-arrow-right-arrow-left fa-fw"></i> Karte/Satellit</button>
+                </div>
               </div>
             </div>
           </div>
@@ -359,34 +362,66 @@
   var markers = [];
   var markerState = true;
   var mapCenterPos = [<?=TT_PLACEHOLDER_GPS_LAT?>, <?=TT_PLACEHOLDER_GPS_LONG?>];
+  var tileLayers = [];
+  var tilesets = ["mapbox/streets-v12", "mapbox/satellite-streets-v12"];
+  var currentTileset = "mapbox/streets-v12";
+  
+  function toggleTileset() {
+    if(currentTileset == "mapbox/streets-v12") {
+      currentTileset = "mapbox/satellite-streets-v12";
+    } else {
+      currentTileset = "mapbox/streets-v12";
+    }
+
+    console.log("renderMap");
+    renderMap(true);
+  }
   
   function refreshMap() {
     // get buildings and render map
     $('#map-link').hide();
     $('#map-row').show();
     getMapdata();
+    $([document.documentElement, document.body]).animate({
+      scrollTop: $("#building-map").offset().top - 150
+    }, 500);
   }
   
-  function renderMap() {
+  function renderMap(tilesetChangeOnly = false) {
     if(buildingMap) {
-      markers.forEach(function(m) {
-        buildingMap.removeLayer(m);
-      });
+      if(!tilesetChangeOnly) {
+        markers.forEach(function(m) {
+          buildingMap.removeLayer(m);
+        });
+      }
     } else {
       buildingMap = L.map('building-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(buildingMap);
+    if(!(currentTileset in tileLayers)) {
+      tileLayers[currentTileset] = 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: 6,
+        maxZoom: 22,
+        id: currentTileset,
+        accessToken: '<?=TT_MAPBOX_TILE_API_TOKEN?>'
+      });
+    }
+
+
+    tileLayers[currentTileset].addTo(buildingMap);
+    // remove all tilesets not currently wanted
+    tilesets.forEach(function(t) {
+      if(t != currentTileset && buildingMap.hasLayer(tileLayers[t])) {
+        buildingMap.removeLayer(tileLayers[t]); 
+      }
+    });
     
     L.MakiMarkers.accessToken = '<?=TT_MAPBOX_TILE_API_TOKEN?>';
     
-    addMarkers();
+    if(!tilesetChangeOnly) {
+      addMarkers();
+    }
   }
   
   
@@ -404,13 +439,13 @@
       var gps = [building.gps_lat, building.gps_long];
       all_coords.push(gps);
       
-      var icon_color = "#CB2B3E";
+      var icon_color = "#ec98a2";
       var icon_name = "home";
       
       if(building.status == "connected") {
-        icon_color = "#2AAD27";
+        icon_color = "#acf0ab";
       } else if(building.status == "pipework-done") {
-        icon_color = "#CB8427";
+        icon_color = "#ffcd8b";
       }
       
       if(building.type.match(/^(Zwei)/i)) {
diff --git a/Layout/default/Preorder/export.csv.php b/Layout/default/Preorder/export.csv.php
index 2047fd008..ee83f1e92 100644
--- a/Layout/default/Preorder/export.csv.php
+++ b/Layout/default/Preorder/export.csv.php
@@ -3,7 +3,7 @@ ob_end_flush();
 header("Content-type: text/csv");
 header('Content-disposition: attachment; filename="preorder-export-'.date('Y-m-d_H-i-s').'.csv"');
 ?>
-Kampagne;Bestelltyp;Status;Anschlusstyp;Anschluss Strasse;Anschluss Hausnummer;Anschluss PLZ;Anschluss Ort;Anschluss Wohneinheit;Anzahl Anschlüsse;Kunde Firma;Kunde UID;Kunde Vorname;Kunde Nachname;Kunde Strasse;Kunde PLZ;Kunde Ort;Kunde Telefon;Kunde Email;Partner;BEP festgelegt;Starterpaket erhalten;
+Kampagne;thetool AdressID;thetool WohneinheitID;Netzgebiet ID;Netzgebiet;Extref;Bestellcode;OAID;Bestelltyp;Status;Anschlusstyp;GWR Adresscode;Anschluss Strasse;Anschluss Hausnummer;Anschluss PLZ;Anschluss Ort;Anschluss Wohneinheit;Grundstück;GDA Eigenschaft;GPS Breite;GPS Länge;Anzahl Anschlüsse;Kunde Firma;Kunde UID;Kunde Vorname;Kunde Nachname;Kunde Strasse;Kunde PLZ;Kunde Ort;Kunde Telefon;Kunde Email;Partner;Addon Lehrverrohrung Grundstück;Addon Hausverkabelung;BEP festgelegt;Starterpaket erhalten;
 <?php
 $line = 0;
 
@@ -12,6 +12,7 @@ while($data = mysqli_fetch_object($res)):
   $status = Layout::getMfValuecacheObject("Preorderstatus", $data->status_id);
   $hausnummer = Layout::getMfValuecacheObject("ADBHausnummer", $data->adb_hausnummer_id);
   $wohneinheit = Layout::getMfValuecacheObject("ADBWohneinheit", $data->adb_wohneinheit_id);
+  $netzgebiet = Layout::getMfValuecacheObject("ADBNetzgebiet", $hausnummer->netzgebiet_id);
   $strasse = Layout::getMfValuecacheObject("ADBStrasse", $hausnummer->strasse_id);
   $gemeinde = Layout::getMfValuecacheObject("ADBGemeinde",$strasse->gemeinde_id);
   $ortschaft = Layout::getMfValuecacheObject("ADBOrtschaft", $hausnummer->ortschaft_id);
@@ -37,8 +38,24 @@ while($data = mysqli_fetch_object($res)):
     if($attribs['inhouse_cabling_supplied']) $inhouse = true;
   }
   
+  $addon_property = 0;
+  $addon_inhouse = 0;
+  if($data->addon_services) {
+    $services = json_decode($data->addon_services);
+    if(is_array($services) && count($services)) {
+      foreach($services as $service) {
+        if($service->service == "installation_onproperty" && $service->ordered) {
+          $addon_property = 1;
+        }
+        if($service->service == "installation_inhouse" && $service->ordered) {
+          $addon_inhouse = 1;
+        }
+      }
+    }
+  }
+  
 ?>
-"<?=$campaign->name?>";"<?=__($data->type,"preorder")?>";"<?=$status->name?>";"<?=__($data->connection_type,"preorder")?>";"<?=$strasse->name?>";"<?=$hausnummer->hausnummer?>";"<?=$plz->plz?>";"<?=$ortschaft->name?>";"<?=$unit_data?>";<?=$data->connection_count?>;"<?=$data->company?>";"<?=$data->uid?>";"<?=$data->firstname?>";"<?=$data->lastname?>";"<?=$data->street?>";"<?=$data->zip?>";"<?=$data->city?>";"<?=$data->phone?>";"<?=$data->email?>";"<?=$partner->getCompanyOrName()?>";<?=($bep) ? "1" : "0"?>;<?=($inhouse) ? "1" : "0"?>;
+"<?=$campaign->name?>";<?=$data->adb_hausnummer_id?>;<?=$data->adb_wohneinheit_id?>;"<?=$netzgebiet->extref?>";"<?=$netzgebiet->name?>";"<?=$data->extref?>";"<?=$data->ucode?>";"<?=$wohneinheit->oaid?>";"<?=__($data->type,"preorder")?>";"<?=$status->name?>";"<?=__($data->connection_type,"preorder")?>";"<?=$hausnummer->adrcd?>";"<?=$strasse->name?>";"<?=$hausnummer->hausnummer?>";"<?=$plz->plz?>";"<?=$ortschaft->name?>";"<?=$unit_data?>";"<?=$hausnummer->grund_nr?>";"<?=$hausnummer->gdaeigenschaft?>";"<?=$hausnummer->gps_lat?>";"<?=$hausnummer->gps_long?>";<?=$data->connection_count?>;"<?=$data->company?>";"<?=$data->uid?>";"<?=$data->firstname?>";"<?=$data->lastname?>";"<?=$data->street?>";"<?=$data->zip?>";"<?=$data->city?>";"<?=$data->phone?>";"<?=$data->email?>";"<?=$partner->getCompanyOrName()?>";<?=$addon_property?>;<?=$addon_inhouse?>;<?=($bep) ? "1" : "0"?>;<?=($inhouse) ? "1" : "0"?>;
 <?php
 $i++;
 if($line % 1000 === 0) {
diff --git a/application/Building/BuildingController.php b/application/Building/BuildingController.php
index 7eb87b9b1..7cebc8ea1 100644
--- a/application/Building/BuildingController.php
+++ b/application/Building/BuildingController.php
@@ -411,7 +411,7 @@ class BuildingController extends mfBaseController {
         $building_term['status'] = "none";
         
         //$this->log->debug("building status: ".print_r($building->status,true));
-        if($term->status->code == TT_TERMSTATUS_CONNECTED) {
+        if($term->status->code >= TT_TERMSTATUS_CONNECTED) {
           $building_term['status'] = "connected";
           $data->status = "connected";
         } elseif($building->status->code == TT_BUILDINGSTATUS_CONNECTED) {