change: bare-select -> select and add optgroup