Got rid of type in GeoQuery

- Got rid of type in GeoQuery (every query is a circle query)
- Changed how updateQueryCriteria() works
- Updated failing tests