More bug fixes to the json structure