Refactor amenities search

may try a better solution server-side.