diff --git a/classes/Validate.php b/classes/Validate.php
index c8ef7f0ee..63dcacc75 100644
--- a/classes/Validate.php
+++ b/classes/Validate.php
@@ -706,47 +706,42 @@ class ValidateCore
         return $id === null || Validate::isUnsignedId($id);
     }
 
-    public static function isOccupancies($occupancies)
-    {
-        if (is_array($occupancies)) {
-            if (count(array_filter(array_keys($occupancies), 'is_string'))) {
-                return Validate::isOccupancy($occupancies);
-            } else {
-                $response = true;
-                foreach ($occupancies as $key => $occupancy) {
-                    $response = $response && Validate::isOccupancy($occupancy);
-                }
-                return $response;
-            }
-        }
-        return false;
-    }
-
     public static function isOccupancy($occupancy)
     {
         if (is_array($occupancy)) {
-            if (!isset($occupancy['adults']) || !$occupancy['adults'] || !Validate::isUnsignedInt($occupancy['adults'])) {
-                return false;
+            if (count(array_filter(array_keys($occupancy), 'is_string'))) {
+                $occupancy = array($occupancy);
             }
-            if (isset($occupancy['children'])) {
-                if (!Validate::isUnsignedInt($occupancy['children'])) {
-                    return false;
-                }
-                if ($occupancy['children'] > 0) {
-                    if (!isset($occupancy['child_ages']) || ($occupancy['children'] != count($occupancy['child_ages'])) || !is_array($occupancy['child_ages'])) {
-                        return false;
-                    } else {
-                        if (is_array($occupancy['child_ages'])) {
-                            foreach($occupancy['child_ages'] as $childAge) {
-                                if (!Validate::isUnsignedInt($childAge)) {
-                                    return false;
+            $response = true;
+            foreach ($occupancy as $key => $roomOccupancy) {
+                if (is_array($roomOccupancy)) {
+                    if (!isset($roomOccupancy['adults']) || !$roomOccupancy['adults'] || !Validate::isUnsignedInt($roomOccupancy['adults'])) {
+                        $response = $response && false;
+                    }
+                    if (isset($roomOccupancy['children'])) {
+                        if (!Validate::isUnsignedInt($roomOccupancy['children'])) {
+                            $response = $response && false;
+                        }
+                        if ($roomOccupancy['children'] > 0) {
+                            if (!isset($roomOccupancy['child_ages']) || ($roomOccupancy['children'] != count($roomOccupancy['child_ages'])) || !is_array($roomOccupancy['child_ages'])) {
+                                $response = $response && false;
+                            } else {
+                                if (is_array($roomOccupancy['child_ages'])) {
+                                    foreach($roomOccupancy['child_ages'] as $childAge) {
+                                        if (!Validate::isUnsignedInt($childAge)) {
+                                            $response = $response && false;
+                                        }
+                                    }
                                 }
                             }
                         }
                     }
+                    $response = $response && true;
+                } else {
+                    $response = $response && false;
                 }
             }
-            return true;
+            return $response;
         }
         return false;
     }
diff --git a/controllers/front/CategoryController.php b/controllers/front/CategoryController.php
index 21a3ea7e9..026ae648a 100644
--- a/controllers/front/CategoryController.php
+++ b/controllers/front/CategoryController.php
@@ -159,7 +159,7 @@ class CategoryControllerCore extends FrontController
 
         // get occupancy of the search
         $occupancy = Tools::getValue('occupancy');
-        if (!Validate::isOccupancies($occupancy)) {
+        if (!Validate::isOccupancy($occupancy)) {
             $occupancy = array();
         }
         $currency = new Currency($this->context->currency->id);
@@ -269,7 +269,7 @@ class CategoryControllerCore extends FrontController
 
         // occupancy of the search
         $occupancy = Tools::getValue('occupancy');
-        if (!Validate::isOccupancies($occupancy)) {
+        if (!Validate::isOccupancy($occupancy)) {
             $occupancy = array();
         }
         $sort_by = Tools::getValue('sort_by');
diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php
index 0e6d66681..040327a44 100644
--- a/controllers/front/ProductController.php
+++ b/controllers/front/ProductController.php
@@ -1218,7 +1218,7 @@ class ProductControllerCore extends FrontController
         $dateFrom = Tools::getValue('date_from');
         $dateTo = Tools::getValue('date_to');
         $occupancy = Tools::getValue('occupancy');
-        if (!Validate::isOccupancies($occupancy)) {
+        if (!Validate::isOccupancy($occupancy)) {
             $occupancy = array();
         }
         $roomTypeDemands = Tools::getValue('room_type_demands');
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php
index 7bfcd1234..1fbd26935 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php
@@ -123,7 +123,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController
         }
 
         $occupancy = Tools::getValue('occupancy');
-        if (!Validate::isOccupancies($occupancy)) {
+        if (!Validate::isOccupancy($occupancy)) {
             $occupancy = array();
         }
 
@@ -615,7 +615,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController
         $date_from = Tools::getValue('date_from');
         $date_to = Tools::getValue('date_to');
         $occupancy = Tools::getValue('occupancy');
-        if (!Validate::isOccupancies($occupancy)) {
+        if (!Validate::isOccupancy($occupancy)) {
             $occupancy = array();
         }
 
diff --git a/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php b/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php
index 452b23d64..7ab3d7138 100644
--- a/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php
+++ b/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php
@@ -184,7 +184,7 @@ class WkRoomSearchHelper
                 if ($occupancyEnabled) {
                     // send occupancy information searched by the user
                     if ($occupancies = Tools::getvalue('occupancy')) {
-                        if (Validate::isOccupancies($occupancies)) {
+                        if (Validate::isOccupancy($occupancies)) {
                             if ($searchedData['occupancies'] = $occupancies) {
                                 $searchedData['occupancy_adults'] = array_sum(
                                     array_column($searchedData['occupancies'], 'adults')