diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index 45a3c24b0..739232cbf 100755
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * @Author: Bernard Hanna
+ * @Date:   2025-03-21 19:14:36
+ * @Last Modified by:   Bernard Hanna
+ */
+
+
 namespace App\Http\Controllers;
 
 use App\Country;
@@ -44,10 +51,9 @@ public function search(Request $request): View
         if (! is_null($country_iso)) {
             $country = Country::where('iso', $country_iso)->first();
             if ($country) {
-                $country->translation = __('countries.'.$country->name);
+                $country->translation = __('countries.' . $country->name);
                 $selected_country[] = $country;
             }
-
         }
 
         $current_year = Carbon::now()->year;
@@ -95,18 +101,21 @@ protected function getEvents(EventFilters $filters)
         }
 
         return $events->get('future')->merge($events->get('past'))->paginate(12);
-
     }
 
     protected function getAllEventsToMap(EventFilters $filters)
     {
 
         $flattened = Arr::flatten($filters->getFilters());
+        $filtered = array_filter($flattened, fn($v) => $v !== null && $v !== '');
+        $composed_key = implode(',', $filtered);
 
-        $composed_key = '';
-
-        foreach ($flattened as $value) {
-            $composed_key .= $value.',';
+        if (empty($composed_key)) {
+            Log::info('Skipping cache due to empty composed_key');
+            return Event::where('status', 'APPROVED')
+                ->filter($filters)
+                ->get()
+                ->groupBy('country');
         }
 
         $value = Cache::get($composed_key, function () use ($composed_key, $filters) {
@@ -127,6 +136,5 @@ protected function getAllEventsToMap(EventFilters $filters)
         Log::info("Serving from cache [{$composed_key}]");
 
         return $value;
-
     }
 }