bugfixes in form generator