#1083 persisting values in dropdowns