added clustering and geojson