multi-select fixes