improve geojson support