Fixing the save form bugs introduced because of the introduction of DTO container for edit forms