LPS-46903 Fix a few bugs on FormBuilder