expanded choice fields fixed