fixed more JSON issues