add control fields properly