#682 - selected option doesn't persist