Added multiselect support - fix