Small changes to generate_json_form and formatting