Improve multi-select