Performance improvements for MultiSelect