Fixed design flow select field
Added some additional validation