diff --git a/Layout/default/Preorder/Form.php b/Layout/default/Preorder/Form.php
index 203d59c7b..c1309ffa7 100644
--- a/Layout/default/Preorder/Form.php
+++ b/Layout/default/Preorder/Form.php
@@ -81,7 +81,7 @@
                       <div class="col-lg-10">
                         <div class="card">
                           <div class="card-body">
-                            <?php if($preorder->id): ?>
+                            <?php if(!$preorder->building_id): ?>
                             <table>
                               <tr>
                                 <td class="check-mark align-top" style="font-size: 2.5em; width:40px;"><i class="fas fa-question text-warning"></i></td>
diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php
index 7ae50bed4..272518daa 100644
--- a/Layout/default/Preorder/Index.php
+++ b/Layout/default/Preorder/Index.php
@@ -53,8 +53,8 @@
                 <td><?=date('d.m.Y H:i', $preorder->create)?></td>
                 <td><?=date('d.m.Y H:i', $preorder->edit)?></td>
                 <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
-                  <a href="<?=self::getUrl("Preordercampaign", "edit", ["id" => $camp->id])?>"><i class="far fa-edit"  title="Vorbestellkampagne Bearbeiten"></i></a>
-                  <a href="<?=self::getUrl("Preordercampaign", "delete", ["id" => $camp->id])?>" class="text-danger" onclick="if(!confirm('Vorbestellkampagne wirklich löschen?')) return false;" title="Vorbestellkampagne Löschen"><i class="fas fa-trash"></i></a>
+                  <a href="<?=self::getUrl("Preorder", "edit", ["id" => $preorder->id])?>"><i class="far fa-edit"  title="Vorbestellkampagne Bearbeiten"></i></a>
+                  <a href="<?=self::getUrl("Preorder", "delete", ["id" => $preorder->id])?>" class="text-danger" onclick="if(!confirm('Vorbestellung wirklich löschen?')) return false;" title="Vorbestellung Löschen"><i class="fas fa-trash"></i></a>
                 </td>
               </tr>
               <?php endforeach; ?>
diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php
index e4d7cb58d..333d352a6 100644
--- a/application/Preorder/PreorderController.php
+++ b/application/Preorder/PreorderController.php
@@ -17,24 +17,59 @@ class PreorderController extends mfBaseController {
   protected function indexAction() {
     $this->layout()->setTemplate("Preorder/Index");
     
+    $rfilter = $this->request->filter;
+    iF(!is_array($rfilter)) {
+      $rfilter = [];
+    }
+    
+    $this->layout->set("filter", $rfilter);
+    
+    $filter = $this->getPreparedFilter($rfilter);
+    
+    // pagination defaults
+    $pagination = [];
+    $pagination['start'] = 0;
+    $pagination['count'] = 25;
+    $pagination['maxItems'] = 0;
+    
+    if(is_numeric($this->request->s)) {
+      $pagination['start'] = intval($this->request->s);
+    }
+    //var_dump($filter);exit;
+    //$pagination['maxItems'] = AddressModel::count($filter);
+    $this->layout()->set("pagination", $pagination);
+    
+    
     $campaign_filter = [];
     
-    if($this->request->campaign_id) {
-      $campaign_id = $this->request->campaign_id;
+    if($filter['campaign_id']) {
+      $campaign_id = $filter['campaign_id'];
       if(is_numeric($campaign_id) && $campaign_id > 0) {
-        $campaign = new Preordercampaign($ampaign);
+        $campaign = new Preordercampaign($campaign);
         $this->layout()->set("campaign", $campaign);
       }
       
       $campaign_filter["preordercampaign_id"] = $campaign_id;
     }
-    
+    //var_dump($campaign_filter);exit;
     $preorders = PreorderModel::search($campaign_filter);
     $this->layout()->set("preorders", $preorders);
     
     
   }
   
+  private function getPreparedFilter($filter) {
+    $new_filter = [];
+    
+    if(is_array($filter) && count($filter)) {
+        foreach($filter as $name => $value) {
+        $new_filter[$name] = $value;
+      }
+    }
+    
+    return $new_filter;
+  }
+  
   protected function addAction() {
     $this->layout()->setTemplate("Preorder/Form");
     
@@ -64,6 +99,28 @@ class PreorderController extends mfBaseController {
     $this->layout()->set("partners", $partners);
   }
   
+  protected function editAction() {
+    $id = $this->request->id;
+    if(!is_numeric($id) || $id < 1) {
+      $this->layout()->setFlash("Vorbestellung nicht gefunden", "error");
+      $this->redirect("Preordercampaign");
+    }
+    
+    $preorder = new Preorder($id);
+    if(!$preorder->id) {
+      $this->layout()->setFlash("Vorbestellung nicht gefunden", "error");
+      $this->redirect("Preordercampaign");
+    }
+    
+    $this->request->set("preordercampaign_id", $preorder->preordercampaign_id); // needed in addAction()
+    $this->layout()->set("preorder", $preorder);
+    
+    //var_dump($preorder->building->street);exit;
+    
+    return $this->addAction();
+    
+  }
+  
   protected function saveAction() {
     $r = $this->request;
     var_dump($r);
diff --git a/application/Preorder/PreorderModel.php b/application/Preorder/PreorderModel.php
index 91dfa6c46..fc9f591a5 100644
--- a/application/Preorder/PreorderModel.php
+++ b/application/Preorder/PreorderModel.php
@@ -112,9 +112,9 @@ class PreorderModel {
 
     //var_dump($filter);exit;
     if(array_key_exists("preordercampaign_id", $filter)) {
-      $preordercampaignid = $filter['preordercampaign_id'];
-      if(is_numeric($preordercampaignid)) {
-        $where .= " AND preordercampaign_id=$preordercampaignid";
+      $preordercampaign_id = $filter['preordercampaign_id'];
+      if(is_numeric($preordercampaign_id)) {
+        $where .= " AND preordercampaign_id=$preordercampaign_id";
       }
     }
     
diff --git a/lib/mvcfronk/mfLayout/mfLayout.php b/lib/mvcfronk/mfLayout/mfLayout.php
index ea31556bb..1b9556f8a 100644
--- a/lib/mvcfronk/mfLayout/mfLayout.php
+++ b/lib/mvcfronk/mfLayout/mfLayout.php
@@ -268,7 +268,7 @@ function __($string, $prefix = null) {
   global $lang;
   
   if(!$lang) {
-    mfLoghandler::singleton()->debug("Loading language file for __() function");
+    //mfLoghandler::singleton()->debug("Loading language file for __() function");
     include(BASEDIR . "/lang/de.php");
   }