fixed issue with GPMap and clean up for GPJSON