updated to keep currently selected option