Treat the geometry as a queryState attribute, to preserve it when adding/removing filters.