Fixup output json data

same as above