diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php
index fd541a7e9..9585429a2 100755
--- a/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php
@@ -42,13 +42,10 @@
                 @endif
 
                 <?php
-                    $query = parse_url(\Illuminate\Support\Facades\Request::path(), PHP_URL_QUERY);
-                    $searchTerm = explode("&", $query);
+                    $term = request()->input('term');
 
-                    foreach($searchTerm as $term){
-                        if (strpos($term, 'term') !== false) {
-                            $serachQuery = $term;
-                        }
+                    if (! is_null($term)) {
+                        $serachQuery = 'term='.request()->input('term');
                     }
                 ?>
 
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
index a97e90ddc..a707597e5 100755
--- a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
@@ -29,13 +29,10 @@
         </div>
 
         <?php
-            $query = parse_url(\Illuminate\Support\Facades\Request::path(), PHP_URL_QUERY);
-            $searchTerm = explode("&", $query);
+            $term = request()->input('term');
 
-            foreach($searchTerm as $term){
-                if (strpos($term, 'term') !== false) {
-                    $serachQuery = $term;
-                }
+            if (! is_null($term)) {
+                $serachQuery = 'term='.request()->input('term');
             }
         ?>
 
diff --git a/public/installer/Email.php b/public/installer/Email.php
index a579e99f6..5d535395e 100644
--- a/public/installer/Email.php
+++ b/public/installer/Email.php
@@ -28,15 +28,15 @@
                         <label for="mail_from" class="required">Store email address</label>
                         <input type="text" name="mail_from" class="control" placeholder="store@example.com" data-validation="required">
                     </div>
-                    
+
                     <div class="control-group" id="mail_username">
                         <label for="mail_username" class="required">Username</label>
                         <input type="text" name="mail_username" class="control" placeholder="store@example.com" data-validation="required">
                     </div>
-                    
+
                     <div class="control-group" id="mail_password">
                         <label for="mail_password" class="required">Password</label>
-                        <input type="password" name="mail_password" class="control" data-validation="length required" data-validation-length="min6">
+                        <input type="password" name="mail_password" class="control">
                     </div>
                 </div>
             </div>
@@ -71,7 +71,7 @@
 
             var EmailTarget = window.location.href.concat('/EmailConfig.php');
 
-            $.ajax({type : 'POST', url :  EmailTarget, data : mailformData, dataType : 'json', encode : true})            
+            $.ajax({type : 'POST', url :  EmailTarget, data : mailformData, dataType : 'json', encode : true})
             .done(function(data) {
                 if (!data.success) {
                     // handle errors
@@ -112,7 +112,7 @@
                 } else {
                     $('#admin').hide();
                     $('#email').hide();
-                    $('#finish').show();                    
+                    $('#finish').show();
                 }
             });
             // stop the form from submitting the normal way and refreshing the page