Refactored. Allow searches by location