making geoquery more independent.