fix syntax and add same logic to choice_widget_expanded