[HH-40214] better json support