Fix GeoAggregate after prepare refactor