refactor to support multi select with optgroup.
Merge remote-tracking branch 'origin/master'