Added support for points and fixed null geojson bug