Fix for selected option in select field helper