updated so dropdown retain their value