No more hardcoded geom field
Bug