diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php
index 9d0b0e8a4..690d6658d 100755
--- a/packages/Webkul/Product/src/Repositories/ProductRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php
@@ -113,7 +113,7 @@ class ProductRepository extends Repository
 
             $perPage = isset($params['limit']) ? $params['limit'] : current($pages);
         } else {
-            $perPage = isset($params['limit']) ? $params['limit'] : 9;
+            $perPage = isset($params['limit']) && !empty($params['limit']) ? $params['limit'] : 9;
         }
 
         $page = Paginator::resolveCurrentPage('page');
@@ -388,7 +388,7 @@ class ProductRepository extends Repository
                             ->where('product_flat.channel', $channel)
                             ->where('product_flat.locale', $locale)
                             ->whereNotNull('product_flat.url_key')
-                            ->where(function($subQuery) use ($term) {  
+                            ->where(function($subQuery) use ($term) {
                                 $queries = explode('_', $term);
 
                                 foreach (array_map('trim', $queries) as $value) {
@@ -399,7 +399,7 @@ class ProductRepository extends Repository
                             ->orderBy('product_id', 'desc');
             })->paginate(16);
         }
-        
+
         return $results;
     }
 
diff --git a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php
index 6a4df8163..5247d65c2 100755
--- a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php
@@ -46,9 +46,9 @@
                 @if (in_array($category->display_mode, [null, 'products_only', 'products_and_description']))
                     <?php $products = $productRepository->getAll($category->id); ?>
 
-                    @if ($products->count())
+                    @include ('shop::products.list.toolbar')
 
-                        @include ('shop::products.list.toolbar')
+                    @if ($products->count())
 
                         @inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar')
 
diff --git a/packages/Webkul/Ui/src/Resources/lang/pl/app.php b/packages/Webkul/Ui/src/Resources/lang/pl/app.php
index 65a467a76..6949c5121 100644
--- a/packages/Webkul/Ui/src/Resources/lang/pl/app.php
+++ b/packages/Webkul/Ui/src/Resources/lang/pl/app.php
@@ -35,4 +35,6 @@ return [
         'items-per-page' => 'Przedmioty na stronę',
         'value-here' => 'Wartość tutaj',
         'numeric-value-here' => 'wartość liczbowa tutaj',
-        'submit' => 'Prześlij'
\ No newline at end of file
+        'submit' => 'Prześlij'
+    ]
+];
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php
index 56b0129ac..b238eeeb5 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php
@@ -308,7 +308,7 @@
 
                 searchedItem.forEach(item => {
                     let splitedItem = item.split('=');
-                    updatedSearchedCollection[splitedItem[0]] = splitedItem[1];
+                    updatedSearchedCollection[splitedItem[0]] = decodeURI(splitedItem[1]);
                 });
 
                 if (updatedSearchedCollection['image-search'] == 1) {