improved search by location