diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php
index c69392746..6ed872395 100644
--- a/Layout/default/Preorder/Index.php
+++ b/Layout/default/Preorder/Index.php
@@ -107,7 +107,7 @@
                   </select>
                 </div>
                 
-                <div class="col-2">
+                <div class="col-1">
                   <label class="form-label" for="filter_unit_missing">Wohneinheit</label>
                   <select name="filter[unit_missing]" id="filter_unit_missing" class="form-control">
                     <option value=""></option>
@@ -116,14 +116,24 @@
                   </select>
                 </div>
                 
-                <div class="col-2">
-                  <label class="form-label" for="filter_unit_count">Anzahl Anschlüsse</label>
+                <div class="col-1">
+                  <label class="form-label" for="filter_connection_count">Anzahl Anschlüsse</label>
                   <select name="filter[connection_count]" id="filter_connection_count" class="form-control">
                     <option value=""></option>
                     <option value="1" <?=(isset($filter) && array_key_exists("connection_count", $filter) && intval($filter['connection_count']) === 1) ? "selected='selected'" : ""?>>1</option>
                     <option value="2" <?=(isset($filter) && array_key_exists("connection_count", $filter) && intval($filter['connection_count']) === 2) ? "selected='selected'" : ""?>> &gt; 1</option>
                   </select>
                 </div>
+                
+                <div class="col-2">
+                  <label class="form-label" for="filter_unit_count">Anzahl GWR Wohneinheiten</label>
+                  <select name="filter[unit_count]" id="filter_unit_count" class="form-control">
+                    <option value=""></option>
+                    <option value="0" <?=(isset($filter) && array_key_exists("unit_count", $filter) && intval($filter['unit_count']) === 0) ? "selected='selected'" : ""?>>0</option>
+                    <option value="1" <?=(isset($filter) && array_key_exists("unit_count", $filter) && intval($filter['unit_count']) === 1) ? "selected='selected'" : ""?>>1</option>
+                    <option value="2" <?=(isset($filter) && array_key_exists("unit_count", $filter) && intval($filter['unit_count']) === 2) ? "selected='selected'" : ""?>> &gt; 1</option>
+                  </select>
+                </div>
               
               <?php endif; ?>
               </div>
diff --git a/application/Preorder/PreorderModel.php b/application/Preorder/PreorderModel.php
index 40dfb3cab..039b694a6 100644
--- a/application/Preorder/PreorderModel.php
+++ b/application/Preorder/PreorderModel.php
@@ -468,6 +468,18 @@ class PreorderModel {
       }
     }
     
+    if(array_key_exists("unit_count", $filter)) {
+      $unit_count = $filter['unit_count'];
+      if(intval($unit_count) === 1) {
+        $where .= " AND adb_hausnummer.unit_count = 1";
+      } elseif(intval($unit_count) === 2) {
+        $where .= " AND adb_hausnummer.unit_count > 1";
+      } elseif(intval($unit_count) === 0) {
+        $where .= " AND adb_hausnummer.unit_count = 0 OR adb_hausnummer.unit_count IS NULL";
+      }
+    }
+    
+    
     if(array_key_exists("attributes", $filter)) {
       $attributes = FronkDB::singleton()->escape($filter['attributes']);
       if(is_array($attributes) && count($attributes)) {