Added logic for simple search by location