Harden ID Matching
Fix Double Call
geojson creation