Fixed data upload bug related to new JSON structure