Fix DynamicSelect choice field

Change-Id: I2ed7f134da1be17f57ec3af82699cff5eda1a82d