[FIX] handling of fields back to the diagram's main model while creating and editing...