Formbuilder bugfixes