hotfix update form, templates and other