DDF-399 added the ability to use a drop down