Fix grouping conflict when editing choices, not creating