DynamicChoice form improvements