Json reports need a fix, added TODO