Refactor amenities search