diff --git a/source/Plugins/AyaNova.Plugin.V8/V8.cs b/source/Plugins/AyaNova.Plugin.V8/V8.cs
index 150162a..08548bc 100644
--- a/source/Plugins/AyaNova.Plugin.V8/V8.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/V8.cs
@@ -166,7 +166,7 @@ namespace AyaNova.PlugIn.V8
         {
             if (Map.ContainsKey(v7id))
             {
-               
+
                 throw new Exception("Error: AddMap - v7id already mapped previously, id is " + v7id.ToString());
             }
             else Map.Add(v7id, v8id);
@@ -182,7 +182,7 @@ namespace AyaNova.PlugIn.V8
             return false;
 
         }
-        
+
 
         private long SafeGetUserMap(Guid id)
         {
@@ -426,13 +426,13 @@ namespace AyaNova.PlugIn.V8
                 if (i.ID == User.AdministratorID) continue;
 
                 User c = User.GetItem(i.ID);
-                
+
 
                 var ObjectTID = new TypeAndID(RootObjectTypes.User, c.ID);
 
                 dynamic d = new JObject();
                 d.name = GetUniqueName(c.FirstName + " " + c.LastName);
-                if (IsDuplicateMapItem(c.ID, c.FirstName+" " + c.LastName, progress)) continue;
+                if (IsDuplicateMapItem(c.ID, c.FirstName + " " + c.LastName, progress)) continue;
                 progress.Op("User " + d.name);
                 d.userType = (int)c.UserType;
 
@@ -571,7 +571,7 @@ namespace AyaNova.PlugIn.V8
 
                 dynamic d = new JObject();
                 d.name = GetUniqueName(c.Name);
-                if (IsDuplicateMapItem(c.ID,c.Name, progress)) continue;
+                if (IsDuplicateMapItem(c.ID, c.Name, progress)) continue;
                 progress.Op(ObjectTypeName + " " + d.name);
                 d.active = c.Active;
                 d.notes = c.Notes;
@@ -1648,7 +1648,7 @@ namespace AyaNova.PlugIn.V8
                 //     if(entry.Key=="UnitNameDisplayFormats.Label.SerialModelVendor") continue;
                 //     if(entry.Key=="UnitNameDisplayFormats.Label.VendorModelSerial") continue;
                 //     if (entry.Key == "O.PartBin") continue;
-                    
+
                 //    allStrings.Add(entry.Value);
                 //}
                 //int CurrentLocaleHash = util.GetOrderIndependentHashCode<string>(allStrings);
@@ -1733,11 +1733,11 @@ namespace AyaNova.PlugIn.V8
 
                         //collect
                         exportItems.Add(new UpdateTranslationItem
-                            {
-                                Id = v8TransItem.Id,
-                                ConcurrencyToken = v8TransItem.ConcurrencyToken,
-                                NewText = v7item.Value
-                            });
+                        {
+                            Id = v8TransItem.Id,
+                            ConcurrencyToken = v8TransItem.ConcurrencyToken,
+                            NewText = v7item.Value
+                        });
                     }
 
 
@@ -1892,8 +1892,16 @@ namespace AyaNova.PlugIn.V8
             s = s.Replace("Workorder", "WorkOrder");
             s = s.Replace("CustomerNoteCustomerNoteTypeID", "CustomerNoteTypeId");
             s = s.Replace("CustomerRequestPartCustomerServiceRequestItemID", "CustomerRequestItemId");
-
-            // WorkorderService.Label.WorkorderPreventiveMaintenanceWorkorderID, destination key WorkOrderPMWorkOrderID 
+            s = s.Replace("WorkOrderItemMiscExpense", "WorkOrderItemExpense");
+            s = s.Replace("WorkOrderItemLoanLoan", "WorkOrderItemLoan");
+            s = s.Replace("WorkOrderItemLaborLabor", "WorkOrderItemLabor");
+            // s = s.Replace("WASXXX", "NOWXXXX");
+            // s = s.Replace("WASXXX", "NOWXXXX");
+            // s = s.Replace("WASXXX", "NOWXXXX");
+            // s = s.Replace("WASXXX", "NOWXXXX");
+            // s = s.Replace("WASXXX", "NOWXXXX");
+            // s = s.Replace("WASXXX", "NOWXXXX");
+            // s = s.Replace("WASXXX", "NOWXXXX");
 
 
 
@@ -1907,6 +1915,24 @@ namespace AyaNova.PlugIn.V8
             // s = s.Replace("WASXXX", "NOWXXXX");
             // s = s.Replace("WASXXX", "NOWXXXX");
             // s = s.Replace("WASXXX", "NOWXXXX");
+            // s = s.Replace("WASXXX", "NOWXXXX");
+            // s = s.Replace("WASXXX", "NOWXXXX");
+            // s = s.Replace("WASXXX", "NOWXXXX");
+            // s = s.Replace("WASXXX", "NOWXXXX");
+            // s = s.Replace("WASXXX", "NOWXXXX");
+            // s = s.Replace("WASXXX", "NOWXXXX");
+            // s = s.Replace("WASXXX", "NOWXXXX");
+            // s = s.Replace("WASXXX", "NOWXXXX");
+            // s = s.Replace("WASXXX", "NOWXXXX");
+            // s = s.Replace("WASXXX", "NOWXXXX");
+            // s = s.Replace("WASXXX", "NOWXXXX");
+            // s = s.Replace("WASXXX", "NOWXXXX");
+            // s = s.Replace("WASXXX", "NOWXXXX");
+            // s = s.Replace("WASXXX", "NOWXXXX");
+            // s = s.Replace("WASXXX", "NOWXXXX");
+            // s = s.Replace("WASXXX", "NOWXXXX");
+            // s = s.Replace("WASXXX", "NOWXXXX");
+            // s = s.Replace("WASXXX", "NOWXXXX");
 
             return s;
         }
@@ -2085,7 +2111,7 @@ namespace AyaNova.PlugIn.V8
 
         private async System.Threading.Tasks.Task<List<int>> ExportCustomFieldSchema(ObjectCustomFields ocf, string v7CustomFieldObjectName, string RavenCustomTranslationKeyObjectName)
         {
-            
+
             var ret = new List<int>();
             if (ocf == null) return ret;
             //NOTE: this code inspired by winforApp::Util.cs PrepareCustomFieldsGrid method