cleaned up obsolete code in FormBuilder
added field tag