Refactor of options_for_select, correctly marks "selected" priority and/or non-priority options.