Made changes to default to previously selected option