Fixed bugs in form types