better confirmation methods and label update for choice fields