geolocation done, queries refactored