Fixed lat*/long* and added GeoJSON support