Fix for duplicate fieldnames with optiongroup references