Using proper query by location