diff --git a/Layout/default/Address/Form.php b/Layout/default/Address/Form.php
index 167797801..590037f7b 100644
--- a/Layout/default/Address/Form.php
+++ b/Layout/default/Address/Form.php
@@ -36,8 +36,8 @@
                   <div class="form-group row">
                     <label class="col-lg-2 col-form-label" for="parent_id">Gehört zu</label>
                     <div class="col-lg-10">
-                      <select class="select2 form-control " name="parent_id" id="parent_id" data-placeholder="Choose ...">
-                        <option value=""></option>
+                      <select class="select2 form-control " name="parent_id" id="parent_id">
+                        <option></option>
                         <?php foreach($parents as $parent): ?>
                           <option value="<?=$parent->id?>" <?=($address->parent_id == $parent->id) ? "selected='selected'" : ""?>><?=($parent->company) ? $parent->company : $parent->getFullName()?></option>
                         <?php endforeach; ?>
@@ -167,6 +167,10 @@
 <!-- end wrapper -->
 
 <script type="text/javascript">
+  $("#parent_id").select2({
+    allowClear: true,
+    placeholder: ""
+  });
   $("#addresstypes").select2();
 </script>
 
diff --git a/application/Address/AddressController.php b/application/Address/AddressController.php
index 3d4b8fa1a..6e9848b69 100644
--- a/application/Address/AddressController.php
+++ b/application/Address/AddressController.php
@@ -14,6 +14,9 @@ class AddressController extends mfBaseController {
   
   protected function addAction() {
     $this->layout()->setTemplate("Address/Form");
+
+    $parents = AddressModel::search(['parent_id' => null]);
+    $this->layout()->set("parents", $parents);
   }
   
   protected function editAction() {
@@ -26,9 +29,6 @@ class AddressController extends mfBaseController {
       return $this->addAction();
     }
     
-    $parents = AddressModel::search(['parent_id' => 0]);
-    $this->layout()->set("parents", $parents);
-    
     return $this->addAction();
   }
   
@@ -53,7 +53,7 @@ class AddressController extends mfBaseController {
     //var_dump($r->addresstypes);exit;
     
     $data = [];
-    $data['parent_id'] = $r->parent_id;
+    $data['parent_id'] = (!$r->parent_id) ? null : $r->parent_id;
     $data['company'] = $r->company;
     $data['firstname'] = $r->firstname;
     $data['lastname'] = $r->lastname;
diff --git a/application/Address/AddressModel.php b/application/Address/AddressModel.php
index 8b73d835b..9d76bef3c 100644
--- a/application/Address/AddressModel.php
+++ b/application/Address/AddressModel.php
@@ -1,7 +1,7 @@
 <?php
 
 class AddressModel {
-  public $parant_id = null;
+  public $parent_id = null;
   public $company = null;
   public $firstname = null;
   public $lastname = null;
@@ -119,6 +119,17 @@ class AddressModel {
         $where .= " AND ( $or )";
       }
     }
+    //var_dump($filter);exit;
+    if(array_key_exists("parent_id", $filter)) {
+      
+      $parentid = $filter['parent_id'];
+      if($parentid === null) {
+        $where .= " AND parent_id IS NULL";
+      } elseif(is_numeric($parentid)) {
+        $where .= " AND parent_id=$parentid";
+      }
+      
+    }
     
     return $where;
   }
diff --git a/lib/mvcfronk/mfBase/mfBaseModel.php b/lib/mvcfronk/mfBase/mfBaseModel.php
index 015d53909..7ae495b67 100644
--- a/lib/mvcfronk/mfBase/mfBaseModel.php
+++ b/lib/mvcfronk/mfBase/mfBaseModel.php
@@ -102,7 +102,11 @@ class mfBaseModel {
 
   public function update(Array $data) {
     foreach($data as $key => $value) {
-      $this->$key = $value;
+      if($value === null) {
+        $this->$key = null;
+      } else {
+        $this->$key = $value;
+      }
     }
   }