Changed custom fields populating code to make it a dictionary again instead of an array of dictionaries.