- Fixed several bugs if a form is enhanced more than once