Added geospatial filtering