prediction fix and adding geoquery