Fixing the issues in DE form import and export