DDF-231 - removed hidden fields