diff --git a/application/Api/v1/AddressdbApicontroller.php b/application/Api/v1/AddressdbApicontroller.php
index a99596ce6..f734a790e 100644
--- a/application/Api/v1/AddressdbApicontroller.php
+++ b/application/Api/v1/AddressdbApicontroller.php
@@ -396,22 +396,36 @@ class AddressdbApicontroller extends mfBaseApicontroller {
           $tmp_addresses[$address_key]['building_unit_count']++;
           
         }
-        
-        foreach($tmp_addresses as $ta) {
-          if($format == "tree") {
+        if($format == "tree") {
+          /*foreach($tmp_addresses as $ta) {
             $addresses[] = $ta;
-          } else {
+          }*/
+          $addresses = array_values($tmp_addresses);
+        } else {
+          foreach($tmp_addresses as $ta) {
             foreach($ta['units'] as $u) {
-              $new_address = $ta;
-              unset($new_address['units']);
-              $new_address['building_oaid'] = $ta['oaid'];
+              $new_address = [];
               $new_address['oaid'] = $u['oaid'];
+              $new_address['buildin_oaid'] = $ta['oaid'];
+              $new_address['street'] = $ta['street'];
+              $new_address['housenumber'] = $ta['housenumber'];
+              $new_address['zip'] = $ta['zip'];
+              $new_address['city'] = $ta['city'];
+              $new_address['district'] = $ta['district'];
+              $new_address['lot_number'] = $ta['lot_number'];
+              $new_address['building_unit_count'] = $ta['building_unit_count'];
               $new_address['num'] = $u['num'];
               $new_address['block'] = $u['block'];
               $new_address['stiege'] = $u['stiege'];
               $new_address['stock'] = $u['stock'];
               $new_address['tuer'] = $u['tuer'];
               $new_address['zusatz'] = $u['zusatz'];
+              $new_address['gps_lat'] = $ta['gps_lat'];
+              $new_address['gps_long'] = $ta['gps_long'];
+              $new_address['rollout_year'] = $ta['rollout_year'];
+              $new_address['rollout_info'] = $ta['rollout_info'];
+              $new_address['preorderTypes'] = $ta['preorderTypes'];
+              
               $addresses[] = $new_address;
             }
           }