add proper multipolygon support