diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php
index 7a7f09921..e6776d091 100755
--- a/packages/Webkul/Product/src/Repositories/ProductRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php
@@ -235,14 +235,12 @@ class ProductRepository extends Repository
                             if ($attribute->type != 'price') {
 
                                 $attributeQuery->where(function ($attributeValueQuery) use ($column, $filterInputValues) {
-                                    // foreach ($filterInputValues as $filterValue) {
-                                    //     if (! is_numeric($filterValue)) {
-                                    //         continue;
-                                    //     }
-                                    //     $attributeValueQuery->orWhereRaw("find_in_set(?, {$column})", [$filterValue]);
-                                    // }
-
-                                    $attributeValueQuery->whereIn($column, $filterInputValues);
+                                    foreach ($filterInputValues as $filterValue) {
+                                        if (! is_numeric($filterValue)) {
+                                            continue;
+                                        }
+                                        $attributeValueQuery->orWhereRaw("find_in_set(?, {$column})", [$filterValue]);
+                                    }
                                 });
 
                             } else {
diff --git a/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php b/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php
index 651d22904..a2f9ca772 100644
--- a/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php
+++ b/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php
@@ -67,12 +67,12 @@ class VelocityServiceProvider extends ServiceProvider
     protected function registerFacades()
     {
         $loader = AliasLoader::getInstance();
-        
+
         $loader->alias('velocity', VelocityFacade::class);
     }
 
     /**
-     * this function will provide global variables shared by view (blade files)
+     * This method will load all publishables.
      *
      * @return boolean
      */
@@ -85,24 +85,26 @@ class VelocityServiceProvider extends ServiceProvider
         $this->publishes([
             __DIR__ . '/../Resources/views/shop' => resource_path('themes/velocity/views'),
         ]);
-        
+
         $this->publishes([__DIR__.'/../Resources/lang' => resource_path('lang/vendor/velocity')]);
 
         return true;
     }
 
     /**
-     * this function will provide global variables shared by view (blade files)
+     * This method will provide global variables shared by view (blade files).
      *
      * @return boolean
      */
     private function loadGloableVariables()
     {
-        $velocityHelper = app('Webkul\Velocity\Helpers\Helper');
-        $velocityMetaData = $velocityHelper->getVelocityMetaData();
+        view()->composer('*', function ($view) {
+            $velocityHelper = app('Webkul\Velocity\Helpers\Helper');
+            $velocityMetaData = $velocityHelper->getVelocityMetaData();
 
-        view()->share('showRecentlyViewed', true);
-        view()->share('velocityMetaData', $velocityMetaData);
+            $view->with('showRecentlyViewed', true);
+            $view->with('velocityMetaData', $velocityMetaData);
+        });
 
         return true;
     }
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/layouts/master.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/layouts/master.blade.php
index 17edcf5a8..1897dd941 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/layouts/master.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/layouts/master.blade.php
@@ -1,10 +1,3 @@
-@php
-    $velocityHelper = app('Webkul\Velocity\Helpers\Helper');
-    $velocityMetaData = $velocityHelper->getVelocityMetaData();
-
-    view()->share('velocityMetaData', $velocityMetaData);
-@endphp
-
 <!DOCTYPE html>
 <html lang="{{ app()->getLocale() }}">