diff --git a/migration/20.10/2010.sql b/migration/20.10/2010.sql
index 3f657347e4a9cb336f6e41221bea875df31e6628..9f79f0bcad95571bfe0e1b68ff0f04456dff77b5 100755
--- a/migration/20.10/2010.sql
+++ b/migration/20.10/2010.sql
@@ -360,6 +360,17 @@ INSERT INTO parameters (id, description, param_value_int) VALUES ('maximumSignRo
 
 UPDATE history_batch SET total_errors = 0 WHERE total_errors IS NULL;
 
+DO $$ BEGIN
+    IF (SELECT count(id) from parameters where id = 'homepage_message') = 0 THEN
+        INSERT INTO parameters (id, param_value_string) VALUES ('homepage_message', '');
+    END IF;
+END$$;
+DO $$ BEGIN
+    IF (SELECT count(id) from parameters where id = 'loginpage_message') = 0 THEN
+        INSERT INTO parameters (id, param_value_string) VALUES ('loginpage_message', '');
+    END IF;
+END$$;
+
 /* ORDER ON CHRONO */
 CREATE OR REPLACE FUNCTION order_alphanum(text) RETURNS text AS $$
 declare
diff --git a/src/app/parameter/controllers/ParameterController.php b/src/app/parameter/controllers/ParameterController.php
index fe0ccfb57460113017c652e3cc39f4c128425502..70af818afca4602a41b5be3127b44923cacda000 100755
--- a/src/app/parameter/controllers/ParameterController.php
+++ b/src/app/parameter/controllers/ParameterController.php
@@ -48,6 +48,28 @@ class ParameterController
             }
         }
 
+        $parameterIds = array_column($parameters, 'id');
+        if (!in_array('loginpage_message', $parameterIds)) {
+            $parameters[] = [
+                "description"        => null,
+                "id"                 => "loginpage_message",
+                "param_value_date"   => null,
+                "param_value_int"    => null,
+                "param_value_string" => "",
+                "value"              => ""
+            ];
+        }
+        if (!in_array('homepage_message', $parameterIds)) {
+            $parameters[] = [
+                "description"        => null,
+                "id"                 => "homepage_message",
+                "param_value_date"   => null,
+                "param_value_int"    => null,
+                "param_value_string" => "",
+                "value"              => ""
+            ];
+        }
+
         return $response->withJson(['parameters' => $parameters]);
     }
 
diff --git a/src/app/search/controllers/SearchController.php b/src/app/search/controllers/SearchController.php
index 884e43be277f1d2e9f27e9ddd27e63167409a013..12890d9cf9e9ceb0e358f82b95d86ebad2d96900 100644
--- a/src/app/search/controllers/SearchController.php
+++ b/src/app/search/controllers/SearchController.php
@@ -342,9 +342,12 @@ class SearchController
             } else {
                 $fields = ['subject', 'replace(alt_identifier, \' \', \'\')', 'barcode'];
 
+                $quick = $body['meta']['values'];
+                $quick = str_replace(' ', '', $quick);
+
                 $fields = AutoCompleteController::getInsensitiveFieldsForRequest(['fields' => $fields]);
                 $requestDataDocument = AutoCompleteController::getDataForRequest([
-                    'search'        => $body['meta']['values'],
+                    'search'        => $quick,
                     'fields'        => $fields,
                     'where'         => [],
                     'data'          => [],
@@ -355,7 +358,7 @@ class SearchController
                 $fields = ['title', 'identifier'];
                 $fields = AutoCompleteController::getInsensitiveFieldsForRequest(['fields' => $fields]);
                 $requestDataAttachment = AutoCompleteController::getDataForRequest([
-                    'search'        => $body['meta']['values'],
+                    'search'        => $quick,
                     'fields'        => $fields,
                     'where'         => [],
                     'data'          => [],