S10 option display issue and multiple selection fix