add multi-select support