fixed - form choices didn't update on changes