Keep current selected value feature added