fixed multi-select options
fixed merge conflicts