fix(select): manage select controller options correctly

Closes #9418
is this change related?