modified files in order to correct the problem with json arrays and to normalize the null values