Added focus support + optgroup/disabled