Fixed the problem where dropdown selections were reset