GIS Polygon support tweaked