More cleanup to GeoQuery