diff --git a/Layout/default/Building/Index.php b/Layout/default/Building/Index.php
index b55772a82..37f1948c9 100644
--- a/Layout/default/Building/Index.php
+++ b/Layout/default/Building/Index.php
@@ -35,7 +35,7 @@
                 <th>Netzgebiet</th>
                 <th>POP</th>
                 <th>Typ</th>
-                <th>Objektcode</th>
+                <th>Objekt ID</th>
                 <th>OAN ID</th>
                 <th>Adresse</th>
                 <th>Einheiten</th>
diff --git a/Layout/default/Pipework/Index.php b/Layout/default/Pipework/Index.php
index e43f10fdb..d95c129fb 100644
--- a/Layout/default/Pipework/Index.php
+++ b/Layout/default/Pipework/Index.php
@@ -37,18 +37,18 @@
                   </select>
                 </div>
                 
-                <div class="col-1">
+                <div class="col-2">
                   <label class="form-label" for="filter_status_id">Objektstatus</label>
                   <select name="filter[status_id]" id="filter_status_id" class="form-control">
                     <option></option>
                     <?php foreach(BuildingstatusModel::getAll() as $status): ?>
-                    <option value="<?=$status->id?>" <?=($filter['status_id'] == $status->id) ? "selected='selected'" : ""?>><?=$status->code?> - <?=$status->name?></option>
+                    <option value="<?=$status->id?>" <?=($filter['status_id'] == $status->id) ? "selected='selected'" : ""?>><?=$status->code?> - <?=__($status->name."-b")?></option>
                     <?php endforeach; ?>
                   </select>
                 </div>
                 
                 <div class="col-1">
-                  <label class="form-label" for="filter_code">Code</label>
+                  <label class="form-label" for="filter_code">Objekt ID</label>
                   <input type="text" class="form-control" name="filter[code]" id="filter_code" value="<?=$filter['code']?>" />
                 </div>
                 
@@ -97,12 +97,12 @@
                         <strong style="white-space: nowrap;"><?=$building->street?></strong><br />
                         <span class="text-success"><?=$building->code?></span><br />
                       </div>
-                      <div class="mt-1">
+                      <div class="mt-4">
                         <?=$building->contact?><br />
                         <strong><?=$building->phone?></strong><br />
                         <?=$building->email?>
                       </div>
-                      <div class="mt-1">
+                      <div class="mt-4">
                         <label><input type="checkbox" form="wf-building-<?=$building->id?>" name="pipework_enabled" value="1" <?=($building->pipework_enabled==1) ? "checked='checked'" : ""?>> Baufreigabe</label>
                       </div>
                       <div>
diff --git a/application/Pipework/PipeworkController.php b/application/Pipework/PipeworkController.php
index b9e877e3a..bd4efa6d0 100644
--- a/application/Pipework/PipeworkController.php
+++ b/application/Pipework/PipeworkController.php
@@ -138,6 +138,9 @@ class PipeworkController extends mfBaseController {
     if($this->me->is(["Admin", "netowner", "pipeplanner"])) {
       if($r->pipework_enabled == 1) {
         $building->pipework_enabled = 1;
+        if($building->status_id < 3) {
+          $building->status_id = 3;
+        }
       } else {
         $building->pipework_enabled = 0;
       }