Added multiselect support - code cleanup