Reorder GeoJSON properties, add a few more