Fixes to multiselect