diff --git a/source/Plugins/AyaNova.Plugin.V8/V8.cs b/source/Plugins/AyaNova.Plugin.V8/V8.cs
index 8bdb109..2d4f0a0 100644
--- a/source/Plugins/AyaNova.Plugin.V8/V8.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/V8.cs
@@ -271,6 +271,7 @@ namespace AyaNova.PlugIn.V8
             {
                 progress.Op("Preparing to export....");
                 V7ToV8IdMap.Clear();
+                V7ToV8WorkOrderItemStatusIdMap.Clear();
                 TagMap.Clear();
                 BankedObjects.Clear();
                 LocaleMap.Clear();
@@ -2418,7 +2419,6 @@ namespace AyaNova.PlugIn.V8
                 d.contractId = Getv7v8IdMapNullOk(c.ContractIDResolved());
                 d.lastStatusId = Getv7v8IdMapNullOk(c.WorkorderService.WorkorderStatusID);
 
-                //TODO: signatures, Addresses
                 var client = c.uiClient;
                 if (client != null)
                 {
@@ -2435,10 +2435,13 @@ namespace AyaNova.PlugIn.V8
                 }
 
 
+                //TODO: signatures, items*
 
 
 
                 TagFromv7Guid(c.RegionID, tags);
+                TagFromv7Guid(c.WorkorderCategoryID, tags);
+
                 SetTags(d, tags);
 
                 var rMainObject = await util.PostAsync("workorder", d.ToString());