diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php
index e6451f67d..2c541b74b 100644
--- a/application/Preorder/PreorderController.php
+++ b/application/Preorder/PreorderController.php
@@ -113,7 +113,7 @@ class PreorderController extends mfBaseController {
     
     if(array_key_exists("kunde", $filter)) {
       $kunde = $this->db()->escape($filter['kunde']);
-      $new_filter['add-where'] .= " AND (company like '%$kunde%' OR firstname like '%$kunde%' OR lastname like '%$kunde%' OR street like '%$kunde%' OR zip like '%$kunde%' OR city like '%$kunde%')";
+      $new_filter['add-where'] .= " AND (company like '%$kunde%' OR firstname like '%$kunde%' OR lastname like '%$kunde%' OR concat(firstname, ' ', lastname) like '%$kunde%' OR concat(lastname, ' ', firstname) like '%$kunde%' OR street like '%$kunde%' OR zip like '%$kunde%' OR city like '%$kunde%')";
     }
     
     
diff --git a/lib/mvcfronk/mfBase/mfBaseController.php b/lib/mvcfronk/mfBase/mfBaseController.php
index f4fdf8299..af9b9908e 100644
--- a/lib/mvcfronk/mfBase/mfBaseController.php
+++ b/lib/mvcfronk/mfBase/mfBaseController.php
@@ -183,7 +183,7 @@ class mfBaseController {
     
     $log = mfLoghandler::singleton();
 		
-    if(MFUSEFANCYURLS && defined('MFFANCYBASEURL')) {
+    if(MFUSEFANCYURLS && defined('MFFANCYBASEURL') && strlen(MFFANCYBASEURL) > 1) {
       // use fancy urls
       $url=MFFANCYBASEURL;
       if($mod) {