Pooja/Melanie | #2973 | Formatting submissions correctly in case of data type changes