issue/CB-2596: Another iteration on the same logic, centralizing logic inside the searchController