diff --git a/Layout/default/AddressDB/View.php b/Layout/default/AddressDB/View.php
index ed0bede47..0f3172977 100644
--- a/Layout/default/AddressDB/View.php
+++ b/Layout/default/AddressDB/View.php
@@ -64,6 +64,12 @@
                       <?php endif; ?>
                     </td>
                   </tr><tr>
+                        <th>Rimo Execution State</th>
+                        <td><?=$address->rimo_ex_state?></td>
+                    </tr><tr>
+                        <th>Rimo Operational State</th>
+                        <td><?=$address->rimo_op_state?></td>
+                    </tr><tr>
                     <td colspan="2"><h4>Status</h4></td>
                   </tr><tr>
                         <th>Status</th>
diff --git a/application/ADBWohneinheit/ADBWohneinheit.php b/application/ADBWohneinheit/ADBWohneinheit.php
index 3a919910b..fac68ebfa 100644
--- a/application/ADBWohneinheit/ADBWohneinheit.php
+++ b/application/ADBWohneinheit/ADBWohneinheit.php
@@ -308,6 +308,8 @@ class ADBWohneinheit extends mfBaseModel {
       }
 
         if($name == "rimo_workorders") {
+            if(!$this->id) return null;
+
             $rimo_workorders = RimoWorkorderModel::search(["adb_wohneinheit_id" => $this->id]);
             if(count($rimo_workorders)) {
                 $this->rimo_workorders = $rimo_workorders;
@@ -316,6 +318,7 @@ class ADBWohneinheit extends mfBaseModel {
         }
 
         if($name == "preorders") {
+            if(!$this->id) return [];
             $preorders = PreorderModel::search(["adb_wohneinheit_id" => $this->id]);
             if(!count($preorders)) {
                 return [];
@@ -325,6 +328,7 @@ class ADBWohneinheit extends mfBaseModel {
         }
 
         if($name == "active_preorders") {
+            if(!$this->id) return [];
             $preorders = PreorderModel::searchActive(["adb_wohneinheit_id" => $this->id]);
             if(!count($preorders)) {
                 return [];
diff --git a/scripts/adb-rimo-import/ADBAddressHelper/address_helper.php b/scripts/adb-rimo-import/ADBAddressHelper/address_helper.php
index a4baa9e17..b79f93cdd 100644
--- a/scripts/adb-rimo-import/ADBAddressHelper/address_helper.php
+++ b/scripts/adb-rimo-import/ADBAddressHelper/address_helper.php
@@ -237,6 +237,11 @@ class AddressHelper
                     $force_no_subcd = true;
                 }
             }
+
+            if($hausnummer && $hausnummer->rimo_id) {
+                $hausnummer = null;
+            }
+
             /*if(!$hausnummer) {
               //echo "Hausnummer adrcd $adrcd not found\n";
             } else {
@@ -254,6 +259,10 @@ class AddressHelper
                 if($hausnummer && $adrcd && $hausnummer->adrcd != $adrcd) {
                     $hausnummer = null;
                 }
+
+                if($hausnummer && $hausnummer->rimo_id) {
+                    $hausnummer = null;
+                }
             //}
             if (!$hausnummer) {
                 // dont create Hausnummer if Canceled in Rimo
diff --git a/scripts/adb-rimo-import/rimo-import.php b/scripts/adb-rimo-import/rimo-import.php
index 66f94e1f3..a392df520 100755
--- a/scripts/adb-rimo-import/rimo-import.php
+++ b/scripts/adb-rimo-import/rimo-import.php
@@ -893,9 +893,9 @@ function getServiceDnValues($dn)
         }
     }
 
-    if(!array_key_exists("Shelf", $fields) && array_key_exists("SpliceBox", $fields)) {
+    /*if(!array_key_exists("Shelf", $fields) && array_key_exists("SpliceBox", $fields)) {
         $fields['Shelf'] = $fields['SpliceBox'];
-    }
+    }*/
 
     return $fields;
 }
diff --git a/scripts/stuff/delete-private-homes.php b/scripts/stuff/delete-private-homes.php
index 67ee7c449..0c7bf4d34 100644
--- a/scripts/stuff/delete-private-homes.php
+++ b/scripts/stuff/delete-private-homes.php
@@ -57,7 +57,7 @@ while($hausnummer_data = $db->fetch_object($res)) {
                 if(ADBWohneinheitModel::count(["oaid" => $del_unit->oaid]) == 1) {
                     //echo "!! Hausnummer ".$hausnummer->id.": cannot delete unit ".$del_unit->id." because it's the last Unit with OAID ".$oaid->oaid."\n";
                     $ftu_id = $del_unit->ftu_data["id"];
-                    RimoApi::unassignOaid($oaid->oaid, $ftu_id);
+                    Rimoapi::unassignOaid($oaid->oaid, $ftu_id);
 
                     echo "Deleting OAID ".$oaid->oaid." from FTU ".$ftu_id."\n";