Bug fix for spaces in multiselect options and spaces for options