Expose main ID in geojson
cleanup