Refactoring for ExportDialog: Change variables order