[Boilerplate] Make sure to use correct geometry type for all grids