diff --git a/Layout/default/Order/Form.php b/Layout/default/Order/Form.php
index 1a44e4417..4f90b9de4 100644
--- a/Layout/default/Order/Form.php
+++ b/Layout/default/Order/Form.php
@@ -1,4 +1,5 @@
 <?php
+
   $includes_external_product = false;
 ?>
 <?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
@@ -41,17 +42,17 @@
                     
                       <div class="form-group row">
                         
-                        
-                        
                         <div class="col-lg-12 mb-2">
                           <h4>Vertragsinhaber</h4>
-                          <select class="form-control select2" name="owner_id" id="owner_id">
+                          
+                          <select class="form-control basicAutoComplete" autocomplete="off" name="owner_id" id="owner_id" data-url="<?=self::getUrl('Address','api')?>?do=findAddress&autocomplete=1" placeholder="Tippen zum suchen..." data-noresults-text="Keine Suchergebnisse">
                             <option></option>
-                            <option value="new" <?=($order->owner_id == "new") ? "selected='selected'" : ""?>>Neu...</option>
-                            <?php foreach($addresses as $address): ?>
-                              <option value="<?=$address->id?>" <?=($address->id == $order->owner_id) ? "selected='selected'" : ""?>><?=$address->getCompanyOrName()?> (<?=$address->zip?> <?=$address->city?>, <?=$address->street?>)</option>
-                            <?php endforeach; ?>
                           </select>
+                          
+                        </div>
+                        
+                        <div class="col-lg-12 mb-2">
+                          <div class="mt-2"><label><input type="checkbox" id="owner_new" /> Neukunde anlegen</label></div>
                         </div>
                         
                         <div class="col-lg-12 hidden" id="owner-form">
@@ -152,13 +153,15 @@
                         
                         <div class="col-lg-12 mb-2">
                           <h4>Rechungsadresse</h4>
-                          <select class="form-control select2" name="billingaddress_id" id="billingaddress_id">
+                          
+                          <select class="form-control basicAutoComplete" autocomplete="off" name="billingaddress_id" id="billingaddress_id" data-url="<?=self::getUrl('Address','api')?>?do=findAddress&autocomplete=1" placeholder="Tippen zum suchen..." data-noresults-text="Keine Suchergebnisse">
                             <option></option>
-                            <option value="new" <?=($order->billingaddress_id == "new") ? "selected='selected'" : ""?>>Neu...</option>
-                            <?php foreach($addresses as $address): ?>
-                              <option value="<?=$address->id?>" <?=($address->id == $order->billingaddress_id) ? "selected='selected'" : ""?>><?=$address->getCompanyOrName()?> (<?=$address->zip?> <?=$address->city?>, <?=$address->street?>)</option>
-                            <?php endforeach; ?>
                           </select>
+
+                        </div>
+                        
+                        <div class="col-lg-12 mb-2">
+                          <div class="mt-2"><label><input type="checkbox" id="billingaddress_new" /> Neue Rechnungsadresse anlegen</label></div>
                         </div>
                         
                         <div class="col-lg-12 hidden" id="billingaddress-form">
@@ -269,21 +272,21 @@
                     </div>
                   </div>
                   
-                  <h5 class="mt-3">Verzögerte Herstellung:</h5>
+                  <h4 class="mt-3">Verzögerte Herstellung:</h4>
                   
-                      <div class="form-group row">
-                        <label class="col-lg-2 col-form-label" for="finish_after">Herstellbar ab</label>
-                        <div class="col-lg-4">
-                          <input type="text" class="form-control" name="finish_after" id="finish_after" value="<?=($order->finish_after) ? date("d.m.Y", $order->finish_after) : ""?>" />
-                        </div>
-                      </div>
-                      
-                      <div class="form-group row">
-                        <label class="col-lg-2 col-form-label" for="finish_after_comment">Verzögerungsgrund</label>
-                        <div class="col-lg-4">
-                          <textarea class="form-control" name="finish_after_comment" id="finish_after_comment" placeholder="Verzögerungsgrund"><?=$order->finish_after_comment?></textarea>
-                        </div>
-                      </div>
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="finish_after">Herstellbar ab</label>
+                    <div class="col-lg-4">
+                      <input type="text" class="form-control" name="finish_after" id="finish_after" value="<?=($order->finish_after) ? date("d.m.Y", $order->finish_after) : ""?>" />
+                    </div>
+                  </div>
+
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="finish_after_comment">Verzögerungsgrund</label>
+                    <div class="col-lg-4">
+                      <textarea class="form-control" name="finish_after_comment" id="finish_after_comment" placeholder="Verzögerungsgrund"><?=$order->finish_after_comment?></textarea>
+                    </div>
+                  </div>
                       
                   
                   
@@ -291,64 +294,68 @@
               </div>
               
               
-              <h4>Verrechnung</h4>
-              <div class="card">
-                <div class="card-body">
-                  
-                  <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="billing_type">Verrechnungsart</label>
-                    <div class="col-lg-10">
-                      <select class="form-control" name="billing_type" id="billing_type">
-                        <option value="invoice" <?=($order->billing_type == "invoice") ? "selected='selected'" : ""?>>Rechnung</option>
-                        <option value="sepa" <?=($order->billing_type == "sepa") ? "selected='selected'" : ""?>>SEPA Bankeinzug</option>
-                      </select>
+              <div id="billing_block" class="hidden">
+                <h4>Verrechnung</h4>
+                <div class="card">
+                  <div class="card-body">
+
+                    <div class="form-group row">
+                      <label class="col-lg-2 col-form-label" for="billing_type">Verrechnungsart</label>
+                      <div class="col-lg-10">
+                        <select class="form-control" name="billing_type" id="billing_type">
+                          <option value="invoice" <?=($order->billing_type == "invoice") ? "selected='selected'" : ""?>>Rechnung</option>
+                          <option value="sepa" <?=($order->billing_type == "sepa") ? "selected='selected'" : ""?>>SEPA Bankeinzug</option>
+                        </select>
+                      </div>
                     </div>
-                  </div>
-                  
-                  <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="bank_account_bank">Kreditinstitut</label>
-                    <div class="col-lg-10">
-                      <input type="text" class="form-control" name="bank_account_bank" id="bank_account_bank" value="<?=$order->bank_account_bank?>" />
+
+                    <div class="form-group row">
+                      <label class="col-lg-2 col-form-label" for="bank_account_bank">Kreditinstitut</label>
+                      <div class="col-lg-10">
+                        <input type="text" class="form-control" name="bank_account_bank" id="bank_account_bank" value="<?=$order->bank_account_bank?>" />
+                      </div>
                     </div>
-                  </div>
-                  
-                  <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="bank_account_owner">Kontoinhaber</label>
-                    <div class="col-lg-10">
-                      <input type="text" class="form-control" name="bank_account_owner" id="bank_account_owner" value="<?=$order->bank_account_owner?>" />
+
+                    <div class="form-group row">
+                      <label class="col-lg-2 col-form-label" for="bank_account_owner">Kontoinhaber</label>
+                      <div class="col-lg-10">
+                        <input type="text" class="form-control" name="bank_account_owner" id="bank_account_owner" value="<?=$order->bank_account_owner?>" />
+                      </div>
                     </div>
-                  </div>
-                  
-                  <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="bank_account_iban">IBAN</label>
-                    <div class="col-lg-10">
-                      <input type="text" class="form-control" name="bank_account_iban" id="bank_account_iban" value="<?=$order->bank_account_iban?>" />
-                      <small id="iban_error" class="hidden">IBAN ungültig!</small>
+
+                    <div class="form-group row">
+                      <label class="col-lg-2 col-form-label" for="bank_account_iban">IBAN</label>
+                      <div class="col-lg-10">
+                        <input type="text" class="form-control" name="bank_account_iban" id="bank_account_iban" value="<?=$order->bank_account_iban?>" />
+                        <small id="iban_error" class="hidden">IBAN ungültig!</small>
+                      </div>
                     </div>
-                  </div>
-                  
-                  <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="bank_account_bic">BIC</label>
-                    <div class="col-lg-10">
-                      <input type="text" class="form-control" name="bank_account_bic" id="bank_account_bic" value="<?=$order->bank_account_bic?>" />
+
+                    <div class="form-group row">
+                      <label class="col-lg-2 col-form-label" for="bank_account_bic">BIC</label>
+                      <div class="col-lg-10">
+                        <input type="text" class="form-control" name="bank_account_bic" id="bank_account_bic" value="<?=$order->bank_account_bic?>" />
+                      </div>
                     </div>
                   </div>
                 </div>
               </div>
               
-              <h4>Einwilligungen</h4>
-              <div class="card">
-                <div class="card-body">
-                  <div class="form-group row">
-                    <div class="col-lg-2"></div>
-                    <div class="col-lg-10">
-                      <label class="form-check-label"><input type="checkbox" class="form-check-input" name="allow_contact" id="allow_contact" <?=($order->allow_contact) ? "checked='checked'" : ""?> /> Informationen per Post/Email/Telefon</label>
+              <div id="accept_block" class="hidden">
+                <h4>Einwilligungen</h4>
+                <div class="card">
+                  <div class="card-body">
+                    <div class="form-group row">
+                      <div class="col-lg-2"></div>
+                      <div class="col-lg-10">
+                        <label class="form-check-label"><input type="checkbox" class="form-check-input" name="allow_contact" id="allow_contact" <?=($order->allow_contact) ? "checked='checked'" : ""?> /> Informationen per Post/Email/Telefon</label>
+                      </div>
                     </div>
-                  </div>
-                  <div class="form-group row">
-                    <div class="col-lg-2"></div>
-                    <div class="col-lg-10">
-                      <label class="form-check-label"><input type="checkbox" class="form-check-input" name="allow_spin" id="allow_spin" <?=($order->allow_spin) ? "checked='checked'" : ""?> /> Auskunft mit Service PIN</label>
+                    <div class="form-group row">
+                      <div class="col-lg-2"></div>
+                      <div class="col-lg-10">
+                        <label class="form-check-label"><input type="checkbox" class="form-check-input" name="allow_spin" id="allow_spin" <?=($order->allow_spin) ? "checked='checked'" : ""?> /> Auskunft mit Service PIN</label>
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -362,6 +369,8 @@
                   <?php if(is_array($order->products) && count($order->products)): ?>
                   <?php foreach($order->products as $product): ?>
                   <?php
+                    if(!is_object($product)) continue;
+                  
                     if($product->product->external == 1) {
                       $includes_external_product = true;
                     }
@@ -391,7 +400,7 @@
                         </div>
                         <div class="col-2">
                           <label class="form-label" for="amount-<?=$product->id?>">Anzahl/Menge</label>
-                          <input type="number" class="form-control" name="products[<?=$product->id?>][amount]" id="amount-<?=$product->id?>" value="<?=$product->formatAmount()?>" placeholder="Anzahl/Menge" />
+                          <input type="number" class="form-control" name="products[<?=$product->id?>][amount]" id="amount-<?=$product->id?>" value="<?=($product) ? $product->formatAmount() : ""?>" placeholder="Anzahl/Menge" />
                         </div>
                         <div class="col-2">
                           <label class="form-label" for="billing_period-<?=$product->id?>">Verrechungsperiode</label>
@@ -705,6 +714,74 @@
     placeholder: ""
   });*/
   
+  /************************
+   * autocomplete
+   */ 
+  
+  // kunde
+  <?php if($order->owner_id && is_object(($order->owner))): ?>
+  $('#owner_id').autoComplete('set', { value: <?=$order->owner_id?>, text: '<?=($order->owner_id) ? $order->owner->getCompanyOrName()." (".$order->owner->zip." ".$order->owner->city.", ".$order->owner->street.")".(($order->owner->customer_number) ? " [".$order->owner->customer_number."]" : "") : ""?>'});
+  <?php else: ?>
+  $('#owner_id').autoComplete();
+  <?php endif; ?>
+
+  $('#owner_id').keydown(function() {
+    if(event.keyCode == 9 || event.keyCode == 13) {
+      event.preventDefault();
+      return false;
+    }
+  });
+  
+  $('#owner_new').change(function() {
+    if($('#owner_new').is(":checked")) {
+      console.log("is new");
+      $('#owner_id').autoComplete('set', null);
+      $('#owner_id').prop('disabled', true);
+    } else {
+      $('#owner_id').prop('disabled', false);
+    }
+  });
+  
+  $('#owner_id').on("autocomplete.select", function(evt, item) {
+    if(item && item.value === 0) {
+      $('#owner_id').autoComplete('set', null);
+    }
+  });
+  
+  // rechnungsadresse
+  <?php if($order->billingaddress_id && is_object($order->billingaddress)): ?>
+  $('#billingaddress_id').autoComplete('set', { value: <?=$order->billingaddress_id?>, text: '<?=($order->billingaddress_id) ? $order->billingaddress->getCompanyOrName()." (".$order->billingaddress->zip." ".$order->billingaddress->city.", ".$order->billingaddress->street.")" : ""?>'});
+  <?php else: ?>
+  $('#billingaddress_id').autoComplete();
+  <?php endif; ?>
+
+  $('#billingaddress_id').keydown(function() {
+    if(event.keyCode == 9 || event.keyCode == 13) {
+      event.preventDefault();
+      return false;
+    }
+  });
+  
+  $('#billingaddress_new').change(function() {
+    if($('#billingaddress_new').is(":checked")) {
+      console.log("billing is new");
+      $('#billingaddress_id').autoComplete('set', null);
+      $('#billingaddress_id').prop('disabled', true);
+    } else {
+      $('#billingaddress_id').prop('disabled', false);
+    }
+  });
+  
+  $('#billingaddress_id').on("autocomplete.select", function(evt, item) {
+    if(item && item.value === 0) {
+      $('#billingaddress_id').autoComplete('set', null);
+    }
+  });
+  /*
+   * autocomplete
+   *******************************/
+  
+  
   $('.select2').each(function(){
     $(this).select2({
       allowClear: true,
@@ -747,7 +824,27 @@
   });
   <?php endif; ?>
   
-  $('#owner_id').change(function() {
+  $('#owner_new').change(function() {
+    if($('#owner_new').prop('checked')) {
+      $('#owner-form').show();
+      $('#billing_block').show();
+      $('#accept_block').show();
+    } else {
+      $('#owner-form').hide();
+      $('#billing_block').hide();
+      $('#accept_block').hide();
+    }
+  });
+  
+  $('#billingaddress_new').change(function() {
+    if($('#billingaddress_new').prop('checked')) {
+      $('#billingaddress-form').show();
+    } else {
+      $('#billingaddress-form').hide();
+    }
+  });
+  
+  /*$('#owner_id').change(function() {
     var val = $('#owner_id').val();
     
     if(val == "new") {
@@ -755,7 +852,7 @@
     } else {
       $('#owner-form').hide();
     }
-  });
+  });*/
   
   $('#billingaddress_id').change(function() {
     var val = $('#billingaddress_id').val();
@@ -896,8 +993,8 @@
   
   function validateOrderForm() {
     var allFields = [
-      "owner_id", "owner_company", "owner_firstname", "owner_lastname", "owner_street", "owner_zip", "owner_city", "owner_country", "owner_phone", "owner_email",
-      "billingaddress_id", "billing_company", "billing_firstname", "billing_lastname", "billing_street", "billing_zip", "billing_city", "billing_country", "billing_phone", "billing_email",
+      "owner_company", "owner_firstname", "owner_lastname", "owner_street", "owner_zip", "owner_city", "owner_country", "owner_phone", "owner_email",
+      "billing_company", "billing_firstname", "billing_lastname", "billing_street", "billing_zip", "billing_city", "billing_country", "billing_phone", "billing_email",
       "order_date", "finish_after", "finish_after_comment", "billing_type", "bank_account_bank", "bank_account_owner", "bank_account_iban", "bank_account_bic"
     ];
     var checkEmpty = [];
@@ -918,7 +1015,7 @@
       checkEmpty.push("finish_after_comment");
     }
 
-    if($('#owner_id').val() == "new") {
+    if(!$('#owner_id').length) {
       if(!$('#owner_company').val()) {
         //console.log("no owner_company");
         if(!$('#owner_firstname').val() || !$('#owner_lastname').val()) {
@@ -935,14 +1032,14 @@
       checkEmpty.push("owner_phone");
       checkEmpty.push("owner_email");
     }
-    
+    /*
     if(!$('#owner_id :selected').val()) {
       $('#owner_id').addClass("invalid");
       $('#owner_id').next().find('.select2-selection').addClass('invalid');
       error = true;
-    }
+    }*/
     
-    if($('#billingaddress_id').val() == "new") {
+    if(!$('#billingaddress_id').length) {
       if(!$('#billing_company').val()) {
         //console.log("no billing_company");
         if(!$('#billing_firstname').val() || !$('#billing_lastname').val()) {
@@ -961,14 +1058,14 @@
     }
     
     //alert("error: " + error);
-    
+    /*
     if(!$('#billingaddress_id :selected').val()) {
       if(!$('#owner_id :selected').val()) {
         $('#billingaddress_id').addClass("invalid");
         $('#billingaddress_id').next().find('.select2-selection').addClass('invalid');
         error = true;
       }
-    }
+    }*/
 
     // check bankdaten
     if($('#billing_type').val() == "sepa") {
@@ -983,6 +1080,18 @@
       }
     }
     
+    // owner_id & billingaddress_id
+    if(!$('input[name=owner_id').length) {
+      error = true;
+      console.log("owner_id empty");
+      $('input[name=owner_id').addClass("invalid");
+    }
+    if(!$('input[name=billingaddress_id').length) {
+      error = true;
+      console.log("billingaddress_id empty");
+      $('input[name=billingaddress_id').addClass("invalid");
+    }
+    
     if(checkEmpty.length) {
       checkEmpty.forEach(function(field) {
         if(!$("#" + field).val().length) {
diff --git a/Layout/default/header.php b/Layout/default/header.php
index a46148c2a..20ac0f942 100644
--- a/Layout/default/header.php
+++ b/Layout/default/header.php
@@ -28,6 +28,7 @@
         <script type="text/javascript" src="<?=self::getResourcePath()?>js/popper.min.js"></script>
         <script type="text/javascript" src="<?=self::getResourcePath()?>js/bootstrap.min.js"></script>
         <script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/bootstrap-select.min.js"></script>
+        <script type="text/javascript" src="<?=self::getResourcePath()?>js/bootstrap-autocomplete.min.js"></script>
         
         
 
diff --git a/application/Address/AddressController.php b/application/Address/AddressController.php
index cb56d36a0..7e8efc47f 100644
--- a/application/Address/AddressController.php
+++ b/application/Address/AddressController.php
@@ -232,6 +232,89 @@ class AddressController extends mfBaseController {
     $this->redirect("Address", "Edit", ['id' => $new_id]);
   }
  
+ 
+  protected function apiAction() {
+    if(!$this->me->is(["Admin","salespartner"])) {
+      $this->redirect("Dashboard");
+    }
+    $do = $this->request->do;
+    $data = [];
+    
+    switch($do) {
+      case "findAddress":
+        $return = $this->findAddressApi();
+        break;
+      default:
+        $return = false;
+    }
+    
+    if(!is_array($return) || !count($return)) {
+      $data = ["status" => "error"];
+      $this->returnJson($data);
+    }
+    $data['status'] = "OK";
+    $data['result'] = $return;
+    $this->returnJson($data);
+  }
   
+  private function findAddressApi() {
+    $search = $this->request->q;
+    $autocomplete = $this->request->autocomplete;
+    
+    $po = 1;
+    $role = false;
+    // if searching for billingaddress, set role and parents_only to 0
+    if($this->request->role == "billingaddress") {
+      $role = "billing";
+      $po = 0;
+    }
+    
+    $addresses = [];
+    $addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "company" => $search]));
+    $addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "firstname" => $search]));
+    $addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "lastname" => $search]));
+    
+    if(!is_array($addresses) && !count($addresses)) {
+      return false;
+    }
+    
+    $all_addresses = [];
+    
+    // remove duplicates
+    foreach($addresses as $address) {
+      if(!array_key_exists($address->id, $all_addresses)) {
+        $all_addresses[$address->id] = $address;
+      }
+    }
+    
+    $results = [];
+
+    if(!$autocomplete) {
+      foreach($all_addresses as $id => $address) {
+        $results[$id] = $address->getCompanyOrName()." (".$address->zip." ".$address->city.", ".$address->street.")".(($address->customer_number) ? " [".$address->customer_number."]" : "");
+        if(count($results) > 5) {
+          $results["more"] = "...";
+          break;
+        }
+      }
+
+      return ["addresses" => $results];
+    }
+    
+    // return bootstrap-autocomplete format
+    foreach($all_addresses as $id => $address) {
+      $result = ['value' => $id, 'text' => $address->getCompanyOrName()." (".$address->zip." ".$address->city.", ".$address->street.")".(($address->customer_number) ? " [".$address->customer_number."]" : "")];
+      $results[] = $result;
+      if(count($results) > 5) {
+        $results[] = ['value' => 0, 'text' =>  "&nbsp;&nbsp;--> &nbsp;&nbsp;Mehr Suchergebnisse vorhanden. Bitte Suchebegriff genauer definieren &nbsp;&nbsp;<--"];
+        break;
+      }
+    }
+
+    $this->returnJson($results);
+  }
   
+  private function searchAddress() {
+    
+  }
 }
\ No newline at end of file
diff --git a/application/Address/AddressModel.php b/application/Address/AddressModel.php
index 738a6e718..28e0fab42 100644
--- a/application/Address/AddressModel.php
+++ b/application/Address/AddressModel.php
@@ -76,6 +76,21 @@ class AddressModel {
     return null;
   }
   
+  public static function getOne($id) {
+    if(!is_numeric($id) || !$id) {
+      throw new Exception("Invalid number", 400);
+    }
+    $item = [];
+    $db = FronkDB::singleton();
+    
+    $res = $db->select("Address", "*", "id=$id LIMIT 1");
+    if($db->num_rows($res)) {
+      $data = $db->fetch_object($res);
+      $item = new Address($data);
+    }
+    return $item;
+  }
+  
   public static function getAll() {
     $items = [];
     
@@ -179,7 +194,7 @@ class AddressModel {
       }
     }
     
-    //mfLoghandler::singleton()->debug($sql);
+    mfLoghandler::singleton()->debug($sql);
     
     $res = $db->query($sql);
     if($db->num_rows($res)) {
diff --git a/application/Order/OrderController.php b/application/Order/OrderController.php
index 4d34ca1b8..8ef65af49 100644
--- a/application/Order/OrderController.php
+++ b/application/Order/OrderController.php
@@ -312,20 +312,20 @@ class OrderController extends mfBaseController {
     
     // validate owner
     $owner = false;
-    if(!$r->owner_id) {
+    /*if(!$r->owner_id) {
       $this->layout()->setFlash("Bitte Vertragsinhaber auswählen oder eintragen.", "error");
       $this->layout()->set("order", $r);
       return $this->add();
-    }
+    }*/
     
-    if(is_numeric($r->owner_id)) {
+    if(is_numeric($r->owner_id) && $r->owner_id > 0) {
       $owner = new Address($r->owner_id);
       if(!$owner->id) {
         $this->layout()->setFlash("Ungültiger Vertragsinhaber.", "error");
         $this->layout()->set("order", $r);
         return $this->add();
       }
-    } elseif($r->owner_id == "new") {
+    } else {
       if(!$r->owner_company && !($r->owner_firstname && $r->owner_lastname)) {
         $this->layout()->setFlash("Fehler in Vertragsinhaber: Firmenname oder Vor- und Nachname benötigt.");
         $this->layout()->set("order", $r);
@@ -339,11 +339,11 @@ class OrderController extends mfBaseController {
           return $this->add();
         }
       }
-    } else {
+    }/* else {
       $this->layout()->setFlash("Ungültiger Vertragsinhaber.");
       $this->layout()->set("order", $r);
       return $this->add();
-    }
+    }*/
     
     
     // validate billindaddress
@@ -357,26 +357,34 @@ class OrderController extends mfBaseController {
           $this->layout()->set("order", $r);
           return $this->add();
         }
-      } elseif($r->billingaddress_id == "new") {
-        if(!$r->billing_company && !($r->billingr_firstname && $r->billing_lastname)) {
-          $this->layout()->setFlash("Fehler in Rechnungsqmpfänger: Firmenname oder Vor- und Nachname benötigt.");
-          $this->layout()->set("order", $r);
-          return $this->add();
-        }
-
-        foreach(["street", "zip", "city", "phone", "email"] as $required) {
-          if(!$r->{"owner_$required"}) {
-            $this->layout()->setFlash("Fehler in Rechnungsempfänger: Bitte alle benötigten Felder ausfüllen.");
-            $this->layout()->set("order", $r);
-            return $this->add();
-          }
-        }
-      } else {
-        $this->layout()->setFlash("Ungültiger Rechnungsempfänger.");
+      }
+    }
+    
+    // if any required part of new billingaddress is set
+    $billingaddress_new = false;
+    if(!$r->billingaddress_id 
+       && ($r->billing_company || $r->billing_firstname || $r->billing_lastname
+       || $r->billing_street || $r->billing_zip || $r->billing_city || $r->billing_phone || $r->billing_email)
+      ) {
+      $billingaddress_new = true;
+      if(!$r->billing_company && !($r->billing_firstname && $r->billing_lastname)) {
+        $this->layout()->setFlash("Fehler in Rechnungsqmpfänger: Firmenname oder Vor- und Nachname benötigt.");
         $this->layout()->set("order", $r);
         return $this->add();
       }
-    }
+
+      foreach(["street", "zip", "city", "phone", "email"] as $required) {
+        if(!$r->{"billing_$required"}) {
+          $this->layout()->setFlash("Fehler in Rechnungsempfänger: Bitte alle benötigten Felder ausfüllen.");
+          $this->layout()->set("order", $r);
+          return $this->add();
+        }
+      }
+    } /*else {
+        $this->layout()->setFlash("Ungültiger Rechnungsempfänger.");
+        $this->layout()->set("order", $r);
+        return $this->add();
+      }*/
     
     // validate sepa
     if(!$r->billing_type) {
@@ -499,7 +507,7 @@ class OrderController extends mfBaseController {
     }
     
     // save owner and billingaddress if new
-    if($r->owner_id == "new") {
+    if(!$r->owner_id) {
       $owner_id = $owner->save();
       if(!$owner_id) {
         $this->layout()->setFlash("Fehler beim Speichern des Inhabers", "error");
@@ -508,13 +516,17 @@ class OrderController extends mfBaseController {
       $order->owner_id = $owner_id;
       $order->save();
     }
-    if($r->billingaddress_id == "new") {
+    if($billingaddress_new) {
       $billingaddress_id = $billingaddress->save();
       if(!$billingaddress_id) {
         $this->layout()->setFlash("Fehler beim Speichern des Rechnungsempfängers", "error");
         $this->redirect("Order", "edit", ['id' => $new_id]);
       }
-      $owner->billingaddress_id = $billingaddress_id;
+      // create addresstype (billing)
+      $at = AddresstypeModel::create(['address_id' => $billingaddress_id, 'type' => "billing"]);
+      $at->save();
+      
+      $order->billingaddress_id = $billingaddress_id;
       $order->save();
     }
     
diff --git a/lang/de.php b/lang/de.php
index 2060466ef..5a9efb963 100644
--- a/lang/de.php
+++ b/lang/de.php
@@ -17,7 +17,7 @@ $l['customers'] = "Kunden";
 $l['supplier'] = "Lieferant";
 $l['suppliers'] = "Lieferanten";
 $l['contact'] = "Kontakt";
-$l['billing'] = "Verrechnungsadresse";
+$l['billing'] = "Rechnungsadresse";
 $l['business'] = "Business";
 $l['residential'] = "Residential";
 
diff --git a/public/js/bootstrap-autocomplete.min.js b/public/js/bootstrap-autocomplete.min.js
index 8b173e38a..00766f4d8 100644
--- a/public/js/bootstrap-autocomplete.min.js
+++ b/public/js/bootstrap-autocomplete.min.js
@@ -1 +1 @@
-!function(n){var s={};function i(e){if(s[e])return s[e].exports;var t=s[e]={i:e,l:!1,exports:{}};return n[e].call(t.exports,t,t.exports,i),t.l=!0,t.exports}i.m=n,i.c=s,i.d=function(e,t,n){i.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(t,e){if(1&e&&(t=i(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var n=Object.create(null);if(i.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var s in t)i.d(n,s,function(e){return t[e]}.bind(null,s));return n},i.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(t,"a",t),t},i.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},i.p="",i(i.s="./src/main.ts")}({"./src/dropdown.ts":function(module,__webpack_exports__,__webpack_require__){"use strict";eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"Dropdown\", function() { return Dropdown; });\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"DropdownV4\", function() { return DropdownV4; });\n/*\n *\tDropdown class. Manages the dropdown drawing\n */\nvar Dropdown = /** @class */ (function () {\n    function Dropdown(e, formatItemCbk, autoSelect, noResultsText) {\n        this.initialized = false;\n        this.shown = false;\n        this.items = [];\n        this.ddMouseover = false;\n        this._$el = e;\n        this.formatItem = formatItemCbk;\n        this.autoSelect = autoSelect;\n        this.noResultsText = noResultsText;\n        // initialize it in lazy mode to deal with glitches like modals\n        // this.init();\n    }\n    Dropdown.prototype.init = function () {\n        var _this = this;\n        // Initialize dropdown\n        var pos = $.extend({}, this._$el.position(), {\n            height: this._$el[0].offsetHeight\n        });\n        // create element\n        this._dd = $('<ul />');\n        // add our class and basic dropdown-menu class\n        this._dd.addClass('bootstrap-autocomplete dropdown-menu');\n        this._dd.insertAfter(this._$el);\n        this._dd.css({ top: pos.top + this._$el.outerHeight(), left: pos.left, width: this._$el.outerWidth() });\n        // click event on items\n        this._dd.on('click', 'li', function (evt) {\n            // console.log('clicked', evt.currentTarget);\n            //console.log($(evt.currentTarget));\n            var item = $(evt.currentTarget).data('item');\n            _this.itemSelectedLaunchEvent(item);\n        });\n        this._dd.on('keyup', function (evt) {\n            if (_this.shown) {\n                switch (evt.which) {\n                    case 27:\n                        // ESC\n                        _this.hide();\n                        _this._$el.focus();\n                        break;\n                }\n                return false;\n            }\n        });\n        this._dd.on('mouseenter', function (evt) {\n            _this.ddMouseover = true;\n        });\n        this._dd.on('mouseleave', function (evt) {\n            _this.ddMouseover = false;\n        });\n        this._dd.on('mouseenter', 'li', function (evt) {\n            if (_this.haveResults) {\n                $(evt.currentTarget).closest('ul').find('li.active').removeClass('active');\n                $(evt.currentTarget).addClass('active');\n                _this.mouseover = true;\n            }\n        });\n        this._dd.on('mouseleave', 'li', function (evt) {\n            _this.mouseover = false;\n        });\n        this.initialized = true;\n    };\n    Dropdown.prototype.checkInitialized = function () {\n        // Lazy init\n        if (!this.initialized) {\n            // if not already initialized\n            this.init();\n        }\n    };\n    Object.defineProperty(Dropdown.prototype, \"isMouseOver\", {\n        get: function () {\n            return this.mouseover;\n        },\n        enumerable: true,\n        configurable: true\n    });\n    Object.defineProperty(Dropdown.prototype, \"isDdMouseOver\", {\n        get: function () {\n            return this.ddMouseover;\n        },\n        enumerable: true,\n        configurable: true\n    });\n    Object.defineProperty(Dropdown.prototype, \"haveResults\", {\n        get: function () {\n            return (this.items.length > 0);\n        },\n        enumerable: true,\n        configurable: true\n    });\n    Dropdown.prototype.focusNextItem = function (reversed) {\n        if (this.haveResults) {\n            // get selected\n            var currElem = this._dd.find('li.active');\n            var nextElem = reversed ? currElem.prev() : currElem.next();\n            if (nextElem.length == 0) {\n                // first \n                nextElem = reversed ? this._dd.find('li').last() : this._dd.find('li').first();\n            }\n            currElem.removeClass('active');\n            nextElem.addClass('active');\n        }\n    };\n    Dropdown.prototype.focusPreviousItem = function () {\n        this.focusNextItem(true);\n    };\n    Dropdown.prototype.selectFocusItem = function () {\n        this._dd.find('li.active').trigger('click');\n    };\n    Object.defineProperty(Dropdown.prototype, \"isItemFocused\", {\n        get: function () {\n            if (this._dd.find('li.active').length > 0) {\n                return true;\n            }\n            return false;\n        },\n        enumerable: true,\n        configurable: true\n    });\n    Dropdown.prototype.show = function () {\n        if (!this.shown) {\n            this._dd.dropdown().show();\n            this.shown = true;\n        }\n    };\n    Dropdown.prototype.isShown = function () {\n        return this.shown;\n    };\n    Dropdown.prototype.hide = function () {\n        if (this.shown) {\n            this._dd.dropdown().hide();\n            this.shown = false;\n        }\n    };\n    Dropdown.prototype.updateItems = function (items, searchText) {\n        // console.log('updateItems', items);\n        this.items = items;\n        this.searchText = searchText;\n        this.refreshItemList();\n    };\n    Dropdown.prototype.showMatchedText = function (text, qry) {\n        var startIndex = text.toLowerCase().indexOf(qry.toLowerCase());\n        if (startIndex > -1) {\n            var endIndex = startIndex + qry.length;\n            return text.slice(0, startIndex) + '<b>'\n                + text.slice(startIndex, endIndex) + '</b>'\n                + text.slice(endIndex);\n        }\n        return text;\n    };\n    Dropdown.prototype.refreshItemList = function () {\n        var _this = this;\n        this.checkInitialized();\n        this._dd.empty();\n        var liList = [];\n        if (this.items.length > 0) {\n            this.items.forEach(function (item) {\n                var itemFormatted = _this.formatItem(item);\n                if (typeof itemFormatted === 'string') {\n                    itemFormatted = { text: itemFormatted };\n                }\n                var itemText;\n                var itemHtml;\n                itemText = _this.showMatchedText(itemFormatted.text, _this.searchText);\n                if (itemFormatted.html !== undefined) {\n                    itemHtml = itemFormatted.html;\n                }\n                else {\n                    itemHtml = itemText;\n                }\n                var disabledItem = itemFormatted.disabled;\n                var li = $('<li >');\n                li.append($('<a>').attr('href', '#!').html(itemHtml))\n                    .data('item', item);\n                if (disabledItem) {\n                    li.addClass('disabled');\n                }\n                liList.push(li);\n            });\n        }\n        else {\n            // No results\n            var li = $('<li >');\n            li.append($('<a>').attr('href', '#!').html(this.noResultsText))\n                .addClass('disabled');\n            liList.push(li);\n        }\n        this._dd.append(liList);\n    };\n    Dropdown.prototype.itemSelectedLaunchEvent = function (item) {\n        // launch selected event\n        // console.log('itemSelectedLaunchEvent', item);\n        this._$el.trigger('autocomplete.select', item);\n    };\n    return Dropdown;\n}());\n\nvar DropdownV4 = /** @class */ (function () {\n    function DropdownV4(e, formatItemCbk, autoSelect, noResultsText) {\n        this.initialized = false;\n        this.shown = false;\n        this.items = [];\n        this.ddMouseover = false;\n        this._$el = e;\n        this.formatItem = formatItemCbk;\n        this.autoSelect = autoSelect;\n        this.noResultsText = noResultsText;\n        // initialize it in lazy mode to deal with glitches like modals\n        // this.init();\n    }\n    DropdownV4.prototype.getElPos = function () {\n        var pos = $.extend({}, this._$el.position(), {\n            height: this._$el[0].offsetHeight\n        });\n        return pos;\n    };\n    DropdownV4.prototype.init = function () {\n        var _this = this;\n        // console.log('UIUIUIUIUIUIUII');\n        // Initialize dropdown\n        var pos = this.getElPos();\n        // create element\n        this._dd = $('<div />');\n        // add our class and basic dropdown-menu class\n        this._dd.addClass('bootstrap-autocomplete dropdown-menu');\n        this._dd.insertAfter(this._$el);\n        this._dd.css({ top: pos.top + this._$el.outerHeight(), left: pos.left, width: this._$el.outerWidth() });\n        // click event on items\n        this._dd.on('click', '.dropdown-item', function (evt) {\n            // console.log('clicked', evt.currentTarget);\n            // console.log($(evt.currentTarget));\n            var item = $(evt.currentTarget).data('item');\n            _this.itemSelectedLaunchEvent(item);\n        });\n        this._dd.on('keyup', function (evt) {\n            if (_this.shown) {\n                switch (evt.which) {\n                    case 27:\n                        // ESC\n                        _this.hide();\n                        _this._$el.focus();\n                        break;\n                }\n                return false;\n            }\n        });\n        this._dd.on('mouseenter', function (evt) {\n            _this.ddMouseover = true;\n        });\n        this._dd.on('mouseleave', function (evt) {\n            _this.ddMouseover = false;\n        });\n        this._dd.on('mouseenter', '.dropdown-item', function (evt) {\n            if (_this.haveResults) {\n                $(evt.currentTarget).closest('div').find('.dropdown-item.active').removeClass('active');\n                $(evt.currentTarget).addClass('active');\n                _this.mouseover = true;\n            }\n        });\n        this._dd.on('mouseleave', '.dropdown-item', function (evt) {\n            _this.mouseover = false;\n        });\n        this.initialized = true;\n    };\n    DropdownV4.prototype.checkInitialized = function () {\n        // Lazy init\n        if (!this.initialized) {\n            // if not already initialized\n            this.init();\n        }\n    };\n    Object.defineProperty(DropdownV4.prototype, \"isMouseOver\", {\n        get: function () {\n            return this.mouseover;\n        },\n        enumerable: true,\n        configurable: true\n    });\n    Object.defineProperty(DropdownV4.prototype, \"isDdMouseOver\", {\n        get: function () {\n            return this.ddMouseover;\n        },\n        enumerable: true,\n        configurable: true\n    });\n    Object.defineProperty(DropdownV4.prototype, \"haveResults\", {\n        get: function () {\n            return (this.items.length > 0);\n        },\n        enumerable: true,\n        configurable: true\n    });\n    DropdownV4.prototype.focusNextItem = function (reversed) {\n        if (this.haveResults) {\n            // get selected\n            var currElem = this._dd.find('.dropdown-item.active');\n            var nextElem = reversed ? currElem.prev() : currElem.next();\n            if (nextElem.length == 0) {\n                // first \n                nextElem = reversed ? this._dd.find('.dropdown-item').last() : this._dd.find('.dropdown-item').first();\n            }\n            currElem.removeClass('active');\n            nextElem.addClass('active');\n        }\n    };\n    DropdownV4.prototype.focusPreviousItem = function () {\n        this.focusNextItem(true);\n    };\n    DropdownV4.prototype.selectFocusItem = function () {\n        this._dd.find('.dropdown-item.active').trigger('click');\n    };\n    Object.defineProperty(DropdownV4.prototype, \"isItemFocused\", {\n        get: function () {\n            if (this._dd && (this._dd.find('.dropdown-item.active').length > 0)) {\n                return true;\n            }\n            return false;\n        },\n        enumerable: true,\n        configurable: true\n    });\n    DropdownV4.prototype.show = function () {\n        if (!this.shown) {\n            var pos = this.getElPos();\n            // this._dd.css({ top: pos.top + this._$el.outerHeight(), left: pos.left, width: this._$el.outerWidth() });\n            this._dd.addClass('show');\n            this.shown = true;\n        }\n    };\n    DropdownV4.prototype.isShown = function () {\n        return this.shown;\n    };\n    DropdownV4.prototype.hide = function () {\n        if (this.shown) {\n            this._dd.removeClass('show');\n            this.shown = false;\n        }\n    };\n    DropdownV4.prototype.updateItems = function (items, searchText) {\n        // console.log('updateItems', items);\n        this.items = items;\n        this.searchText = searchText;\n        this.refreshItemList();\n    };\n    DropdownV4.prototype.showMatchedText = function (text, qry) {\n        var startIndex = text.toLowerCase().indexOf(qry.toLowerCase());\n        if (startIndex > -1) {\n            var endIndex = startIndex + qry.length;\n            return text.slice(0, startIndex) + '<b>'\n                + text.slice(startIndex, endIndex) + '</b>'\n                + text.slice(endIndex);\n        }\n        return text;\n    };\n    DropdownV4.prototype.refreshItemList = function () {\n        var _this = this;\n        this.checkInitialized();\n        this._dd.empty();\n        var liList = [];\n        if (this.items.length > 0) {\n            this.items.forEach(function (item) {\n                var itemFormatted = _this.formatItem(item);\n                if (typeof itemFormatted === 'string') {\n                    itemFormatted = { text: itemFormatted };\n                }\n                var itemText;\n                var itemHtml;\n                itemText = _this.showMatchedText(itemFormatted.text, _this.searchText);\n                if (itemFormatted.html !== undefined) {\n                    itemHtml = itemFormatted.html;\n                }\n                else {\n                    itemHtml = itemText;\n                }\n                var disabledItem = itemFormatted.disabled;\n                var li = $('<a >');\n                li.attr('href', '#!')\n                    .addClass('dropdown-item')\n                    .html(itemHtml)\n                    .data('item', item);\n                if (disabledItem) {\n                    li.addClass('disabled');\n                }\n                liList.push(li);\n            });\n        }\n        else {\n            // No results\n            var li = $('<a >');\n            li.attr('href', '#!')\n                .addClass('dropdown-item disabled')\n                .html(this.noResultsText);\n            liList.push(li);\n        }\n        this._dd.append(liList);\n    };\n    DropdownV4.prototype.itemSelectedLaunchEvent = function (item) {\n        // launch selected event\n        // console.log('itemSelectedLaunchEvent', item);\n        this._$el.trigger('autocomplete.select', item);\n    };\n    return DropdownV4;\n}());\n\n\n\n//# sourceURL=webpack:///./src/dropdown.ts?")},"./src/main.ts":function(module,__webpack_exports__,__webpack_require__){"use strict";eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _resolvers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./resolvers */ \"./src/resolvers.ts\");\n/* harmony import */ var _dropdown__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./dropdown */ \"./src/dropdown.ts\");\n/* =============================================================\n * bootstrap-autocomplete.js v2.0.0\n * https://github.com/xcash/bootstrap-autocomplete\n * =============================================================\n * Forked from bootstrap3-typeahead.js v3.1.0\n * https://github.com/bassjobsen/Bootstrap-3-Typeahead\n * =============================================================\n * Original written by @mdo and @fat\n * =============================================================\n * Copyright 2018 Paolo Casciello @xcash666 and contributors\n *\n * Licensed under the MIT License (the 'License');\n * you may not use this file except in compliance with the License.\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an 'AS IS' BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * ============================================================ */\n\n\nvar AutoCompleteNS;\n(function (AutoCompleteNS) {\n    var AutoComplete = /** @class */ (function () {\n        function AutoComplete(element, options) {\n            this._selectedItem = null;\n            this._defaultValue = null;\n            this._defaultText = null;\n            this._isSelectElement = false;\n            this._settings = {\n                resolver: 'ajax',\n                resolverSettings: {},\n                minLength: 3,\n                valueKey: 'value',\n                formatResult: this.defaultFormatResult,\n                autoSelect: true,\n                noResultsText: 'No results',\n                events: {\n                    typed: null,\n                    searchPre: null,\n                    search: null,\n                    searchPost: null,\n                    select: null,\n                    focus: null,\n                }\n            };\n            this._el = element;\n            this._$el = $(this._el);\n            // element type\n            if (this._$el.is('select')) {\n                this._isSelectElement = true;\n            }\n            // inline data attributes\n            this.manageInlineDataAttributes();\n            // constructor options\n            if (typeof options === 'object') {\n                this._settings = $.extend(true, {}, this.getSettings(), options);\n            }\n            if (this._isSelectElement) {\n                this.convertSelectToText();\n            }\n            // console.log('initializing', this._settings);\n            this.init();\n        }\n        AutoComplete.prototype.manageInlineDataAttributes = function () {\n            // updates settings with data-* attributes\n            var s = this.getSettings();\n            if (this._$el.data('url')) {\n                s['resolverSettings'].url = this._$el.data('url');\n            }\n            if (this._$el.data('default-value')) {\n                this._defaultValue = this._$el.data('default-value');\n            }\n            if (this._$el.data('default-text')) {\n                this._defaultText = this._$el.data('default-text');\n            }\n            if (this._$el.data('noresults-text')) {\n                s['noResultsText'] = this._$el.data('noresults-text');\n            }\n        };\n        AutoComplete.prototype.getSettings = function () {\n            return this._settings;\n        };\n        AutoComplete.prototype.getBootstrapVersion = function () {\n            // @ts-ignore\n            var version_string = $.fn.button.Constructor.VERSION;\n            var version_array = version_string.split('.');\n            return version_array;\n        };\n        AutoComplete.prototype.convertSelectToText = function () {\n            // create hidden field\n            var hidField = $('<input>');\n            hidField.attr('type', 'hidden');\n            hidField.attr('name', this._$el.attr('name'));\n            if (this._defaultValue) {\n                hidField.val(this._defaultValue);\n            }\n            this._selectHiddenField = hidField;\n            hidField.insertAfter(this._$el);\n            // create search input element\n            var searchField = $('<input>');\n            // copy all attributes\n            searchField.attr('type', 'text');\n            searchField.attr('name', this._$el.attr('name') + '_text');\n            searchField.attr('id', this._$el.attr('id'));\n            searchField.attr('disabled', this._$el.attr('disabled'));\n            searchField.attr('placeholder', this._$el.attr('placeholder'));\n            searchField.attr('autocomplete', 'new-password');\n            searchField.addClass(this._$el.attr('class'));\n            if (this._defaultText) {\n                searchField.val(this._defaultText);\n            }\n            // attach class\n            searchField.data(AutoCompleteNS.AutoComplete.NAME, this);\n            // replace original with searchField\n            this._$el.replaceWith(searchField);\n            this._$el = searchField;\n            this._el = searchField.get(0);\n        };\n        AutoComplete.prototype.init = function () {\n            // bind default events\n            this.bindDefaultEventListeners();\n            // RESOLVER\n            if (this._settings.resolver === 'ajax') {\n                // configure default resolver\n                this.resolver = new _resolvers__WEBPACK_IMPORTED_MODULE_0__[\"AjaxResolver\"](this._settings.resolverSettings);\n            }\n            // Dropdown\n            if (this.getBootstrapVersion()[0] == 4) {\n                // v4\n                this._dd = new _dropdown__WEBPACK_IMPORTED_MODULE_1__[\"DropdownV4\"](this._$el, this._settings.formatResult, this._settings.autoSelect, this._settings.noResultsText);\n            }\n            else {\n                this._dd = new _dropdown__WEBPACK_IMPORTED_MODULE_1__[\"Dropdown\"](this._$el, this._settings.formatResult, this._settings.autoSelect, this._settings.noResultsText);\n            }\n        };\n        AutoComplete.prototype.bindDefaultEventListeners = function () {\n            var _this = this;\n            this._$el.on('keydown', function (evt) {\n                // console.log('keydown', evt.which, evt);\n                switch (evt.which) {\n                    case 9: // TAB\n                        if (_this._settings.autoSelect) {\n                            // if autoSelect enabled selects on blur the currently selected item\n                            _this._dd.selectFocusItem();\n                        }\n                        break;\n                    case 13: // ENTER\n                        if (_this._dd.isItemFocused) {\n                            _this._dd.selectFocusItem();\n                        }\n                        else {\n                            if (_this._$el.val() !== '') {\n                                _this._$el.trigger('autocomplete.freevalue', _this._$el.val());\n                            }\n                        }\n                        _this._dd.hide();\n                        break;\n                }\n            });\n            this._$el.on('keyup', function (evt) {\n                // console.log('keyup', evt.which, evt);\n                // check key\n                switch (evt.which) {\n                    case 16: // shift\n                    case 17: // ctrl\n                    case 18: // alt\n                    case 39: // right\n                    case 37: // left \n                        break;\n                    case 40:\n                        // arrow DOWN\n                        _this._dd.focusNextItem();\n                        break;\n                    case 38: // up arrow\n                        _this._dd.focusPreviousItem();\n                        break;\n                    case 13:\n                        // ENTER\n                        _this._dd.hide();\n                        break;\n                    case 27:\n                        // ESC\n                        _this._dd.hide();\n                        break;\n                    default:\n                        var newValue = _this._$el.val();\n                        _this.handlerTyped(newValue);\n                }\n            });\n            this._$el.on('blur', function (evt) {\n                // console.log(evt);\n                if (!_this._dd.isMouseOver && _this._dd.isDdMouseOver && _this._dd.isShown()) {\n                    // Firefox Workaround\n                    setTimeout(function () { _this._$el.focus(); });\n                    // Other browsers\n                    _this._$el.focus();\n                }\n                else if (!_this._dd.isMouseOver) {\n                    if (_this._isSelectElement) {\n                        // if it's a select element you must\n                        if (_this._dd.isItemFocused) {\n                            _this._dd.selectFocusItem();\n                        }\n                        else if ((_this._selectedItem !== null) && (_this._$el.val() !== '')) {\n                            // reselect it\n                            _this._$el.trigger('autocomplete.select', _this._selectedItem);\n                        }\n                        else if ((_this._$el.val() !== '') && (_this._defaultValue !== null)) {\n                            // select Default\n                            _this._$el.val(_this._defaultText);\n                            _this._selectHiddenField.val(_this._defaultValue);\n                            _this._selectedItem = null;\n                        }\n                        else {\n                            // empty the values\n                            _this._$el.val('');\n                            _this._selectHiddenField.val('');\n                            _this._selectedItem = null;\n                        }\n                    }\n                    else {\n                        // It's a text element, we accept custom value.\n                        // Developers may subscribe to `autocomplete.freevalue` to get notified of this\n                        if ((_this._selectedItem === null) && (_this._$el.val() !== '')) {\n                            _this._$el.trigger('autocomplete.freevalue', _this._$el.val());\n                        }\n                    }\n                    _this._dd.hide();\n                }\n            });\n            // selected event\n            // @ts-ignore - Ignoring TS type checking\n            this._$el.on('autocomplete.select', function (evt, item) {\n                _this._selectedItem = item;\n                _this.itemSelectedDefaultHandler(item);\n            });\n        };\n        AutoComplete.prototype.handlerTyped = function (newValue) {\n            // field value changed\n            // custom handler may change newValue\n            if (this._settings.events.typed !== null) {\n                newValue = this._settings.events.typed(newValue, this._$el);\n                if (!newValue)\n                    return;\n            }\n            // if value >= minLength, start autocomplete\n            if (newValue.length >= this._settings.minLength) {\n                this._searchText = newValue;\n                this.handlerPreSearch();\n            }\n            else {\n                this._dd.hide();\n            }\n        };\n        AutoComplete.prototype.handlerPreSearch = function () {\n            // do nothing, start search\n            // custom handler may change newValue\n            if (this._settings.events.searchPre !== null) {\n                var newValue = this._settings.events.searchPre(this._searchText, this._$el);\n                if (!newValue)\n                    return;\n                this._searchText = newValue;\n            }\n            this.handlerDoSearch();\n        };\n        AutoComplete.prototype.handlerDoSearch = function () {\n            var _this = this;\n            // custom handler may change newValue\n            if (this._settings.events.search !== null) {\n                this._settings.events.search(this._searchText, function (results) {\n                    _this.postSearchCallback(results);\n                }, this._$el);\n            }\n            else {\n                // Default behaviour\n                // search using current resolver\n                if (this.resolver) {\n                    this.resolver.search(this._searchText, function (results) {\n                        _this.postSearchCallback(results);\n                    });\n                }\n            }\n        };\n        AutoComplete.prototype.postSearchCallback = function (results) {\n            // console.log('callback called', results);\n            // custom handler may change newValue\n            if (this._settings.events.searchPost) {\n                results = this._settings.events.searchPost(results, this._$el);\n                if ((typeof results === 'boolean') && !results)\n                    return;\n            }\n            this.handlerStartShow(results);\n        };\n        AutoComplete.prototype.handlerStartShow = function (results) {\n            // console.log(\"defaultEventStartShow\", results);\n            // for every result, draw it\n            this._dd.updateItems(results, this._searchText);\n            this._dd.show();\n        };\n        AutoComplete.prototype.itemSelectedDefaultHandler = function (item) {\n            // console.log('itemSelectedDefaultHandler', item);\n            // default behaviour is set elment's .val()\n            var itemFormatted = this._settings.formatResult(item);\n            if (typeof itemFormatted === 'string') {\n                itemFormatted = { text: itemFormatted };\n            }\n            this._$el.val(itemFormatted.text);\n            // if the element is a select\n            if (this._isSelectElement) {\n                this._selectHiddenField.val(itemFormatted.value);\n            }\n            // save selected item\n            this._selectedItem = item;\n            // and hide\n            this._dd.hide();\n        };\n        AutoComplete.prototype.defaultFormatResult = function (item) {\n            if (typeof item === 'string') {\n                return { text: item };\n            }\n            else if (item.text) {\n                return item;\n            }\n            else {\n                // return a toString of the item as last resort\n                // console.error('No default formatter for item', item);\n                return { text: item.toString() };\n            }\n        };\n        AutoComplete.prototype.manageAPI = function (APICmd, params) {\n            // manages public API\n            if (APICmd === 'set') {\n                this.itemSelectedDefaultHandler(params);\n            }\n        };\n        AutoComplete.NAME = 'autoComplete';\n        return AutoComplete;\n    }());\n    AutoCompleteNS.AutoComplete = AutoComplete;\n})(AutoCompleteNS || (AutoCompleteNS = {}));\n(function ($, window, document) {\n    // @ts-ignore\n    $.fn[AutoCompleteNS.AutoComplete.NAME] = function (optionsOrAPI, optionalParams) {\n        return this.each(function () {\n            var pluginClass;\n            pluginClass = $(this).data(AutoCompleteNS.AutoComplete.NAME);\n            if (!pluginClass) {\n                pluginClass = new AutoCompleteNS.AutoComplete(this, optionsOrAPI);\n                $(this).data(AutoCompleteNS.AutoComplete.NAME, pluginClass);\n            }\n            pluginClass.manageAPI(optionsOrAPI, optionalParams);\n        });\n    };\n})(jQuery, window, document);\n\n\n//# sourceURL=webpack:///./src/main.ts?")},"./src/resolvers.ts":function(module,__webpack_exports__,__webpack_require__){"use strict";eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"BaseResolver\", function() { return BaseResolver; });\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"AjaxResolver\", function() { return AjaxResolver; });\nvar __extends = (undefined && undefined.__extends) || (function () {\n    var extendStatics = function (d, b) {\n        extendStatics = Object.setPrototypeOf ||\n            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||\n            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };\n        return extendStatics(d, b);\n    };\n    return function (d, b) {\n        extendStatics(d, b);\n        function __() { this.constructor = d; }\n        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());\n    };\n})();\nvar BaseResolver = /** @class */ (function () {\n    function BaseResolver(options) {\n        this._settings = $.extend(true, {}, this.getDefaults(), options);\n    }\n    BaseResolver.prototype.getDefaults = function () {\n        return {};\n    };\n    BaseResolver.prototype.getResults = function (limit, start, end) {\n        return this.results;\n    };\n    BaseResolver.prototype.search = function (q, cbk) {\n        cbk(this.getResults());\n    };\n    return BaseResolver;\n}());\n\nvar AjaxResolver = /** @class */ (function (_super) {\n    __extends(AjaxResolver, _super);\n    function AjaxResolver(options) {\n        return _super.call(this, options) || this;\n        // console.log('resolver settings', this._settings);\n    }\n    AjaxResolver.prototype.getDefaults = function () {\n        return {\n            url: '',\n            method: 'get',\n            queryKey: 'q',\n            extraData: {},\n            timeout: undefined,\n            requestThrottling: 500\n        };\n    };\n    AjaxResolver.prototype.search = function (q, cbk) {\n        var _this = this;\n        if (this.jqXHR != null) {\n            this.jqXHR.abort();\n        }\n        var data = {};\n        data[this._settings.queryKey] = q;\n        $.extend(data, this._settings.extraData);\n        // request throttling\n        if (this.requestTID) {\n            clearTimeout(this.requestTID);\n        }\n        this.requestTID = setTimeout(function () {\n            _this.jqXHR = $.ajax(_this._settings.url, {\n                method: _this._settings.method,\n                data: data,\n                timeout: _this._settings.timeout\n            });\n            _this.jqXHR.done(function (result) {\n                cbk(result);\n            });\n            _this.jqXHR.fail(function (err) {\n                // console.log(err);\n            });\n            _this.jqXHR.always(function () {\n                _this.jqXHR = null;\n            });\n        }, this._settings.requestThrottling);\n    };\n    return AjaxResolver;\n}(BaseResolver));\n\n\n\n//# sourceURL=webpack:///./src/resolvers.ts?")}});
\ No newline at end of file
+!function(s){var i={};function o(t){if(i[t])return i[t].exports;var e=i[t]={i:t,l:!1,exports:{}};return s[t].call(e.exports,e,e.exports,o),e.l=!0,e.exports}o.m=s,o.c=i,o.d=function(t,e,s){o.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:s})},o.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},o.t=function(e,t){if(1&t&&(e=o(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var s=Object.create(null);if(o.r(s),Object.defineProperty(s,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var i in e)o.d(s,i,function(t){return e[t]}.bind(null,i));return s},o.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return o.d(e,"a",e),e},o.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},o.p="",o(o.s=0)}([function(t,e,s){"use strict";s.r(e),s.d(e,"AutoComplete",function(){return d});var i,o,n,r=(i=function(t,e){return(i=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var s in e)e.hasOwnProperty(s)&&(t[s]=e[s])})(t,e)},function(t,e){function s(){this.constructor=t}i(t,e),t.prototype=null===e?Object.create(e):(s.prototype=e.prototype,new s)}),l=(_.prototype.getDefaults=function(){return{}},_.prototype.getResults=function(t,e,s){return this.results},_.prototype.search=function(t,e){e(this.getResults())},r(p,o=_),p.prototype.getDefaults=function(){return{url:"",method:"get",queryKey:"q",extraData:{},timeout:void 0,requestThrottling:500}},p.prototype.search=function(t,e){var s=this;null!=this.jqXHR&&this.jqXHR.abort();var i={};i[this._settings.queryKey]=t,$.extend(i,this._settings.extraData),this.requestTID&&window.clearTimeout(this.requestTID),this.requestTID=window.setTimeout(function(){s.jqXHR=$.ajax(s._settings.url,{method:s._settings.method,data:i,timeout:s._settings.timeout}),s.jqXHR.done(function(t){e(t)}),s.jqXHR.fail(function(t){var e;null===(e=s._settings)||void 0===e||e.fail(t)}),s.jqXHR.always(function(){s.jqXHR=null})},this._settings.requestThrottling)},p),a=(f.prototype.init=function(){var s=this,t=$.extend({},this._$el.position(),{height:this._$el[0].offsetHeight});this._dd=$("<ul />"),this._dd.addClass("bootstrap-autocomplete dropdown-menu"),this._dd.insertAfter(this._$el),this._dd.css({top:t.top+this._$el.outerHeight(),left:t.left,width:this._$el.outerWidth()}),this._dd.on("click","li",function(t){var e=$(t.currentTarget).data("item");s.itemSelectedLaunchEvent(e)}),this._dd.on("keyup",function(t){if(s.shown){switch(t.which){case 27:s.hide(),s._$el.focus()}return!1}}),this._dd.on("mouseenter",function(t){s.ddMouseover=!0}),this._dd.on("mouseleave",function(t){s.ddMouseover=!1}),this._dd.on("mouseenter","li",function(t){s.haveResults&&($(t.currentTarget).closest("ul").find("li.active").removeClass("active"),$(t.currentTarget).addClass("active"),s.mouseover=!0)}),this._dd.on("mouseleave","li",function(t){s.mouseover=!1}),this.initialized=!0},f.prototype.checkInitialized=function(){this.initialized||this.init()},Object.defineProperty(f.prototype,"isMouseOver",{get:function(){return this.mouseover},enumerable:!1,configurable:!0}),Object.defineProperty(f.prototype,"isDdMouseOver",{get:function(){return this.ddMouseover},enumerable:!1,configurable:!0}),Object.defineProperty(f.prototype,"haveResults",{get:function(){return 0<this.items.length},enumerable:!1,configurable:!0}),f.prototype.focusNextItem=function(t){var e,s;this.haveResults&&(e=this._dd.find("li.active"),0===(s=t?e.prev():e.next()).length&&(s=t?this._dd.find("li").last():this._dd.find("li").first()),e.removeClass("active"),s.addClass("active"))},f.prototype.focusPreviousItem=function(){this.focusNextItem(!0)},f.prototype.selectFocusItem=function(){this._dd.find("li.active").trigger("click")},Object.defineProperty(f.prototype,"isItemFocused",{get:function(){return!!(this.isShown()&&0<this._dd.find("li.active").length)},enumerable:!1,configurable:!0}),f.prototype.show=function(){this.shown||(this._dd.dropdown().show(),this.shown=!0)},f.prototype.isShown=function(){return this.shown},f.prototype.hide=function(){this.shown&&(this._dd.dropdown().hide(),this.shown=!1)},f.prototype.updateItems=function(t,e){this.items=t,this.searchText=e,this.refreshItemList()},f.prototype.showMatchedText=function(t,e){var s=t.toLowerCase().indexOf(e.toLowerCase());if(-1<s){var i=s+e.length;return t.slice(0,s)+"<b>"+t.slice(s,i)+"</b>"+t.slice(i)}return t},f.prototype.refreshItemList=function(){var r=this;this.checkInitialized(),this._dd.empty();var t,l=[];0<this.items.length?this.items.forEach(function(t){var e,s,i=r.formatItem(t);"string"==typeof i&&(i={text:i}),e=r.showMatchedText(i.text,r.searchText),s=void 0!==i.html?i.html:e;var o=i.disabled,n=$("<li >");n.append($("<a>").attr("href","#!").html(s)).data("item",t),o&&n.addClass("disabled"),l.push(n)}):((t=$("<li >")).append($("<a>").attr("href","#!").html(this.noResultsText)).addClass("disabled"),l.push(t)),this._dd.append(l)},f.prototype.itemSelectedLaunchEvent=function(t){this._$el.trigger("autocomplete.select",t)},f),h=(c.prototype.getElPos=function(){return $.extend({},this._$el.position(),{height:this._$el[0].offsetHeight})},c.prototype.init=function(){var s=this,t=this.getElPos();this._dd=$("<div />"),this._dd.addClass("bootstrap-autocomplete dropdown-menu"),this._dd.insertAfter(this._$el),this._dd.css({top:t.top+this._$el.outerHeight(),left:t.left,width:this._$el.outerWidth()}),this._dd.on("click",".dropdown-item",function(t){var e=$(t.currentTarget).data("item");s.itemSelectedLaunchEvent(e),t.preventDefault()}),this._dd.on("keyup",function(t){if(s.shown){switch(t.which){case 27:s.hide(),s._$el.focus()}return!1}}),this._dd.on("mouseenter",function(t){s.ddMouseover=!0}),this._dd.on("mouseleave",function(t){s.ddMouseover=!1}),this._dd.on("mouseenter",".dropdown-item",function(t){s.haveResults&&($(t.currentTarget).closest("div").find(".dropdown-item.active").removeClass("active"),$(t.currentTarget).addClass("active"),s.mouseover=!0)}),this._dd.on("mouseleave",".dropdown-item",function(t){s.mouseover=!1}),this.initialized=!0},c.prototype.checkInitialized=function(){this.initialized||this.init()},Object.defineProperty(c.prototype,"isMouseOver",{get:function(){return this.mouseover},enumerable:!1,configurable:!0}),Object.defineProperty(c.prototype,"isDdMouseOver",{get:function(){return this.ddMouseover},enumerable:!1,configurable:!0}),Object.defineProperty(c.prototype,"haveResults",{get:function(){return 0<this.items.length},enumerable:!1,configurable:!0}),c.prototype.focusNextItem=function(t){var e,s;this.haveResults&&(e=this._dd.find(".dropdown-item.active"),0===(s=t?e.prev():e.next()).length&&(s=t?this._dd.find(".dropdown-item").last():this._dd.find(".dropdown-item").first()),e.removeClass("active"),s.addClass("active"))},c.prototype.focusPreviousItem=function(){this.focusNextItem(!0)},c.prototype.selectFocusItem=function(){this._dd.find(".dropdown-item.active").trigger("click")},Object.defineProperty(c.prototype,"isItemFocused",{get:function(){return!!(this._dd&&this.isShown()&&0<this._dd.find(".dropdown-item.active").length)},enumerable:!1,configurable:!0}),c.prototype.show=function(){this.shown||(this.getElPos(),this._dd.addClass("show"),this.shown=!0,this._$el.trigger("autocomplete.dd.shown"))},c.prototype.isShown=function(){return this.shown},c.prototype.hide=function(){this.shown&&(this._dd.removeClass("show"),this.shown=!1,this._$el.trigger("autocomplete.dd.hidden"))},c.prototype.updateItems=function(t,e){this.items=t,this.searchText=e,this.refreshItemList()},c.prototype.showMatchedText=function(t,e){var s=t.toLowerCase().indexOf(e.toLowerCase());if(-1<s){var i=s+e.length;return t.slice(0,s)+"<b>"+t.slice(s,i)+"</b>"+t.slice(i)}return t},c.prototype.refreshItemList=function(){var r=this;this.checkInitialized(),this._dd.empty();var t,l=[];0<this.items.length?(this.items.forEach(function(t){var e,s,i=r.formatItem(t);"string"==typeof i&&(i={text:i}),e=r.showMatchedText(i.text,r.searchText),s=void 0!==i.html?i.html:e;var o=i.disabled,n=$("<a >");n.addClass("dropdown-item").css({overflow:"hidden","text-overflow":"ellipsis"}).html(s).data("item",t),o&&n.addClass("disabled"),l.push(n)}),this._dd.append(l),this.show()):""===this.noResultsText?this.hide():((t=$("<a >")).addClass("dropdown-item disabled").html(this.noResultsText),l.push(t),this._dd.append(l),this.show())},c.prototype.itemSelectedLaunchEvent=function(t){this._$el.trigger("autocomplete.select",t)},c),d=(u.prototype.manageInlineDataAttributes=function(){var t=this.getSettings();this._$el.data("url")&&(t.resolverSettings.url=this._$el.data("url")),this._$el.data("default-value")&&(this._defaultValue=this._$el.data("default-value")),this._$el.data("default-text")&&(this._defaultText=this._$el.data("default-text")),void 0!==this._$el.data("noresults-text")&&(t.noResultsText=this._$el.data("noresults-text"))},u.prototype.getSettings=function(){return this._settings},u.prototype.getBootstrapVersion=function(){var t="auto"===this._settings.bootstrapVersion?$.fn.button.Constructor.VERSION.split(".").map(parseInt):"4"===this._settings.bootstrapVersion?[4]:"3"===this._settings.bootstrapVersion?[3]:(console.error("INVALID value for 'bootstrapVersion' settings property: "+this._settings.bootstrapVersion+" defaulting to 4"),[4]);return t},u.prototype.convertSelectToText=function(){var t=$("<input>");t.attr("type","hidden"),t.attr("name",this._$el.attr("name")),this._defaultValue&&t.val(this._defaultValue),(this._selectHiddenField=t).insertAfter(this._$el);var e=$("<input>");e.attr("type","search"),e.attr("name",this._$el.attr("name")+"_text"),e.attr("id",this._$el.attr("id")),e.attr("disabled",this._$el.attr("disabled")),e.attr("placeholder",this._$el.attr("placeholder")),e.attr("autocomplete","off"),e.addClass(this._$el.attr("class")),this._defaultText&&e.val(this._defaultText);var s=this._$el.attr("required");s&&e.attr("required",s),e.data(u.NAME,this),this._$el.replaceWith(e),this._$el=e,this._el=e.get(0)},u.prototype.init=function(){this.bindDefaultEventListeners(),"ajax"===this._settings.resolver&&(this.resolver=new l(this._settings.resolverSettings)),4===this.getBootstrapVersion()[0]?this._dd=new h(this._$el,this._settings.formatResult,this._settings.autoSelect,this._settings.noResultsText):this._dd=new a(this._$el,this._settings.formatResult,this._settings.autoSelect,this._settings.noResultsText)},u.prototype.bindDefaultEventListeners=function(){var s=this;this._$el.on("keydown",function(t){switch(t.which){case 9:s._dd.isItemFocused?s._dd.selectFocusItem():s._selectedItem||""!==s._$el.val()&&s._$el.trigger("autocomplete.freevalue",s._$el.val()),s._dd.hide();break;case 13:s._dd.isItemFocused?s._dd.selectFocusItem():s._selectedItem||""!==s._$el.val()&&s._$el.trigger("autocomplete.freevalue",s._$el.val()),s._dd.hide(),s._settings.preventEnter&&t.preventDefault();break;case 40:s._dd.focusNextItem();break;case 38:s._dd.focusPreviousItem()}}),this._$el.on("keyup",function(t){switch(t.which){case 16:case 17:case 18:case 39:case 37:case 36:case 35:break;case 13:case 27:s._dd.hide();break;case 40:case 38:break;default:s._selectedItem=null;var e=s._$el.val();s.handlerTyped(e)}}),this._$el.on("blur",function(t){!s._dd.isMouseOver&&s._dd.isDdMouseOver&&s._dd.isShown()?(setTimeout(function(){s._$el.focus()}),s._$el.focus()):s._dd.isMouseOver||(s._isSelectElement?s._dd.isItemFocused?s._dd.selectFocusItem():(null!==s._selectedItem&&""!==s._$el.val()||(""!==s._$el.val()&&null!==s._defaultValue?(s._$el.val(s._defaultText),s._selectHiddenField.val(s._defaultValue)):(s._$el.val(""),s._selectHiddenField.val("")),s._selectedItem=null),s._$el.trigger("autocomplete.select",s._selectedItem)):null===s._selectedItem&&s._$el.trigger("autocomplete.freevalue",s._$el.val()),s._dd.hide())}),this._$el.on("autocomplete.select",function(t,e){s._selectedItem=e,s.itemSelectedDefaultHandler(e)}),this._$el.on("paste",function(t){setTimeout(function(){s._$el.trigger("keyup",t)},0)})},u.prototype.handlerTyped=function(t){null!==this._settings.events.typed&&!(t=this._settings.events.typed(t,this._$el))||(t.length>=this._settings.minLength?(this._searchText=t,this.handlerPreSearch()):this._dd.hide())},u.prototype.handlerPreSearch=function(){if(null!==this._settings.events.searchPre){var t=this._settings.events.searchPre(this._searchText,this._$el);if(!t)return;this._searchText=t}this.handlerDoSearch()},u.prototype.handlerDoSearch=function(){var e=this;null!==this._settings.events.search?this._settings.events.search(this._searchText,function(t){e.postSearchCallback(t)},this._$el):this.resolver&&this.resolver.search(this._searchText,function(t){e.postSearchCallback(t)})},u.prototype.postSearchCallback=function(t){this._settings.events.searchPost&&"boolean"==typeof(t=this._settings.events.searchPost(t,this._$el))&&!t||this.handlerStartShow(t)},u.prototype.handlerStartShow=function(t){this._dd.updateItems(t,this._searchText)},u.prototype.itemSelectedDefaultHandler=function(t){var e;null!=t?("string"==typeof(e=this._settings.formatResult(t))&&(e={text:e}),this._$el.val(e.text),this._isSelectElement&&this._selectHiddenField.val(e.value)):(this._$el.val(""),this._isSelectElement&&this._selectHiddenField.val("")),this._selectedItem=t,this._dd.hide()},u.prototype.defaultFormatResult=function(t){return"string"==typeof t?{text:t}:t.text?t:{text:t.toString()}},u.prototype.manageAPI=function(t,e){"set"===t?this.itemSelectedDefaultHandler(e):"clear"===t?this.itemSelectedDefaultHandler(null):"show"===t?this._$el.trigger("keyup"):"updateResolver"===t&&(this.resolver=new l(e))},u.NAME="autoComplete",u);function u(t,e){this._selectedItem=null,this._defaultValue=null,this._defaultText=null,this._isSelectElement=!1,this._settings={resolver:"ajax",resolverSettings:{},minLength:3,valueKey:"value",formatResult:this.defaultFormatResult,autoSelect:!0,noResultsText:"No results",bootstrapVersion:"auto",preventEnter:!1,events:{typed:null,searchPre:null,search:null,searchPost:null,select:null,focus:null}},this._el=t,this._$el=$(this._el),this._$el.is("select")&&(this._isSelectElement=!0),this.manageInlineDataAttributes(),"object"==typeof e&&(this._settings=$.extend(!0,{},this.getSettings(),e)),this._isSelectElement&&this.convertSelectToText(),this.init()}function c(t,e,s,i){this.initialized=!1,this.shown=!1,this.items=[],this.ddMouseover=!1,this._$el=t,this.formatItem=e,this.autoSelect=s,this.noResultsText=i}function f(t,e,s,i){this.initialized=!1,this.shown=!1,this.items=[],this.ddMouseover=!1,this._$el=t,this.formatItem=e,this.autoSelect=s,this.noResultsText=i}function p(t){return o.call(this,t)||this}function _(t){this._settings=$.extend(!0,{},this.getDefaults(),t)}n=jQuery,window,document,n.fn[d.NAME]=function(e,s){return this.each(function(){var t;(t=n(this).data(d.NAME))||(t=new d(this,e),n(this).data(d.NAME,t)),t.manageAPI(e,s)})}}]);
\ No newline at end of file
diff --git a/scripts/import_customers_from_ivt.php b/scripts/import_customers_from_ivt.php
index 4bd4373ae..d016f4d24 100644
--- a/scripts/import_customers_from_ivt.php
+++ b/scripts/import_customers_from_ivt.php
@@ -49,7 +49,7 @@ foreach(IvtCustomerModel::getAll() as $cust) {
   $address_data['firstname'] = $cust->firstname;
   $address_data['lastname'] = $cust->surname;
   $address_data['street'] = $cust->street;
-  if(!empty($cust->housenumber)) {
+  if(strlen($cust->housenumber)) {
     $address_data['street'] .= " ".$cust->housenumber;
   }
   $address_data['zip'] = $cust->zip;
diff --git a/scripts/update_customers_street.php b/scripts/update_customers_street.php
new file mode 100644
index 000000000..18874547f
--- /dev/null
+++ b/scripts/update_customers_street.php
@@ -0,0 +1,50 @@
+#!/usr/bin/php
+<?php
+
+// ivtcustomer id blacklist
+//$blacklist = [3805];
+
+//require 'vendor/autoload.php';
+require("../config/config.php");
+
+define('FRONKDB_SQLDEBUG',false);
+error_reporting(E_ALL & ~(E_NOTICE | E_STRICT | E_DEPRECATED));
+
+require_once(LIBDIR."/mvcfronk/mfRouter/mfRouter.php");
+require_once(LIBDIR."/mvcfronk/mfBase/mfBaseModel.php");
+require_once(LIBDIR."/mvcfronk/mfBase/mfBaseController.php");
+
+$me = new User(1);
+
+$db = FronkDB::singleton();
+//$ivt = new FronkDB(IVT_DBHOST, IVT_DBUSER, IVT_DBPASS, IVT_DBNAME);
+
+
+$sql = "SELECT * FROM Address WHERE customer_number < 100000 AND customer_number > 1";
+$res = $db->query($sql);
+if(!$db->num_rows($res)) {
+  echo "no addresses\n";
+  exit;
+}
+
+while($data = $db->fetch_object($res)) {
+  $address = new Address($data);
+  if(!$address->id) {
+    continue;
+  }
+  
+  $cust = new IvtCustomer($address->customer_number);
+  if(!$cust->id) {
+    echo "not an ivt customer".$cust->id." - ".$address->customer_number."\n";
+  }
+  
+  $address->street = $cust->street;
+  if(strlen($cust->housenumber)) {
+    $address->street .= " ".$cust->housenumber;
+  }
+  
+  //var_dump($address);exit;
+  if(!$address->save()) {
+    echo "Error updateing address";
+  }
+}
\ No newline at end of file