Fixing repeating fields

Certain repeating fields had the same name and was causing problems