Form / Field now in object. Fix adding/ removing fields after template creation