diff --git a/PROMS/VEPROMS User Interface/dlgExportImportEP.cs b/PROMS/VEPROMS User Interface/dlgExportImportEP.cs
index 818587ed..87a746c8 100644
--- a/PROMS/VEPROMS User Interface/dlgExportImportEP.cs	
+++ b/PROMS/VEPROMS User Interface/dlgExportImportEP.cs	
@@ -55,14 +55,23 @@ namespace VEPROMS
 		//Overridden function to handle export of EP data
 		protected override void ExportEPAnnotationInfo(XmlElement xe, ItemInfo ii)
 		{
-			//switch to handle customizations for different formats
-			switch (ii.ActiveFormat.PlantFormat.EPFormatFiles.Find(x => x.AnnotationTypeID == _AnnotationType.TypeID)?.Name)
+			if (_UnitIndex > 0)
+            {
+				ii.MyDocVersion.DocVersionConfig.SelectedSlave = _UnitIndex;
+				ii.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = _UnitIndex;
+            }
+
+            //switch to handle customizations for different formats
+            switch (ii.ActiveFormat.PlantFormat.EPFormatFiles.Find(x => x.AnnotationTypeID == _AnnotationType.TypeID)?.Name)
 			{
 				default:
 					ExportEPAnnotationInfo_Default(xe, ii);
 					break;
 			}
-		
+
+			ii.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
+			ii.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
+
 		}
 
 		//default export of EP Data
@@ -242,18 +251,13 @@ namespace VEPROMS
 				return dbSeq(ii);
 			}
 		}
-		//return a db sequence string from an ItemInfo
-		private string dbSeq(ItemInfo ii)
-		{
-			if (_UnitIndex > 0) ii.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = _UnitIndex;
-			string rtnval = $"{((FolderInfo)ii.MyDocVersion.ActiveParent).Name}:{ii.MyProcedure.DisplayNumber} {ii.MyProcedure.DisplayText}:{ii.DBSequence}";
-			ii.MyProcedure.MyDocVersion.DocVersionConfig.SelectedSlave = 0;
-			return rtnval;
-		}
 
-		//For Exporting an RO that is an image
-		//returns the Location and FileName of the RO Image
-		private string GetROImageFileLocation(ROFSTLookup.rochild roc, RODbInfo rodb, bool isMulti)
+        //return a db sequence string from an ItemInfo
+        private string dbSeq(ItemInfo ii) => $"{((FolderInfo)ii.MyDocVersion.ActiveParent).Name}:{ii.MyProcedure.DisplayNumber} {ii.MyProcedure.DisplayText}:{ii.DBSequence}";
+
+        //For Exporting an RO that is an image
+        //returns the Location and FileName of the RO Image
+        private string GetROImageFileLocation(ROFSTLookup.rochild roc, RODbInfo rodb, bool isMulti)
 		{
 			string rodbpath = rodb.FolderPath;