fix choice reset when children/choices change