Change selected_options functionality