Bug fixes in DE for save form