Additional fix on persistent ID's for groups field options