Fix multiselect logic