diff --git a/server/AyaNova/DataList/PMItemDataList.cs b/server/AyaNova/DataList/PMItemDataList.cs
index 02774937..80ec73d0 100644
--- a/server/AyaNova/DataList/PMItemDataList.cs
+++ b/server/AyaNova/DataList/PMItemDataList.cs
@@ -81,7 +81,7 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "apmitem.tags"
diff --git a/server/AyaNova/DataList/PMItemExpenseDataList.cs b/server/AyaNova/DataList/PMItemExpenseDataList.cs
index 3ec82b01..215e6eac 100644
--- a/server/AyaNova/DataList/PMItemExpenseDataList.cs
+++ b/server/AyaNova/DataList/PMItemExpenseDataList.cs
@@ -186,7 +186,7 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "apmitem.tags"
diff --git a/server/AyaNova/DataList/PMItemLaborDataList.cs b/server/AyaNova/DataList/PMItemLaborDataList.cs
index 4e2d762b..02bd7216 100644
--- a/server/AyaNova/DataList/PMItemLaborDataList.cs
+++ b/server/AyaNova/DataList/PMItemLaborDataList.cs
@@ -203,7 +203,7 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "apmitem.tags"
diff --git a/server/AyaNova/DataList/PMItemLoanDataList.cs b/server/AyaNova/DataList/PMItemLoanDataList.cs
index eaf3fa58..864de04d 100644
--- a/server/AyaNova/DataList/PMItemLoanDataList.cs
+++ b/server/AyaNova/DataList/PMItemLoanDataList.cs
@@ -191,7 +191,7 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "apmitem.tags"
diff --git a/server/AyaNova/DataList/PMItemOutsideServiceDataList.cs b/server/AyaNova/DataList/PMItemOutsideServiceDataList.cs
index 2c2754ad..90f369a1 100644
--- a/server/AyaNova/DataList/PMItemOutsideServiceDataList.cs
+++ b/server/AyaNova/DataList/PMItemOutsideServiceDataList.cs
@@ -206,7 +206,7 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "apmitem.tags"
diff --git a/server/AyaNova/DataList/PMItemPartDataList.cs b/server/AyaNova/DataList/PMItemPartDataList.cs
index 761eda3d..6da15548 100644
--- a/server/AyaNova/DataList/PMItemPartDataList.cs
+++ b/server/AyaNova/DataList/PMItemPartDataList.cs
@@ -192,7 +192,7 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "apmitem.tags"
diff --git a/server/AyaNova/DataList/PMItemScheduledUserDataList.cs b/server/AyaNova/DataList/PMItemScheduledUserDataList.cs
index e6bb9da6..02473a53 100644
--- a/server/AyaNova/DataList/PMItemScheduledUserDataList.cs
+++ b/server/AyaNova/DataList/PMItemScheduledUserDataList.cs
@@ -173,7 +173,7 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "apmitem.tags"
diff --git a/server/AyaNova/DataList/PMItemTaskDataList.cs b/server/AyaNova/DataList/PMItemTaskDataList.cs
index b4659c71..f8e42c03 100644
--- a/server/AyaNova/DataList/PMItemTaskDataList.cs
+++ b/server/AyaNova/DataList/PMItemTaskDataList.cs
@@ -160,7 +160,7 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "apmitem.tags"
diff --git a/server/AyaNova/DataList/PMItemTravelDataList.cs b/server/AyaNova/DataList/PMItemTravelDataList.cs
index aa2523cf..8886b88a 100644
--- a/server/AyaNova/DataList/PMItemTravelDataList.cs
+++ b/server/AyaNova/DataList/PMItemTravelDataList.cs
@@ -189,7 +189,7 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "apmitem.tags"
diff --git a/server/AyaNova/DataList/PMItemUnitDataList.cs b/server/AyaNova/DataList/PMItemUnitDataList.cs
index 84657c8d..12fe89fe 100644
--- a/server/AyaNova/DataList/PMItemUnitDataList.cs
+++ b/server/AyaNova/DataList/PMItemUnitDataList.cs
@@ -159,7 +159,7 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "apmitem.tags"
diff --git a/server/AyaNova/DataList/QuoteItemDataList.cs b/server/AyaNova/DataList/QuoteItemDataList.cs
index 371e511c..1e7a3221 100644
--- a/server/AyaNova/DataList/QuoteItemDataList.cs
+++ b/server/AyaNova/DataList/QuoteItemDataList.cs
@@ -80,7 +80,7 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "aquoteitem.tags"
diff --git a/server/AyaNova/DataList/QuoteItemExpenseDataList.cs b/server/AyaNova/DataList/QuoteItemExpenseDataList.cs
index df8b8079..5f77809b 100644
--- a/server/AyaNova/DataList/QuoteItemExpenseDataList.cs
+++ b/server/AyaNova/DataList/QuoteItemExpenseDataList.cs
@@ -185,7 +185,7 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "aquoteitem.tags"
diff --git a/server/AyaNova/DataList/QuoteItemLaborDataList.cs b/server/AyaNova/DataList/QuoteItemLaborDataList.cs
index f4a0e30a..6e88e11d 100644
--- a/server/AyaNova/DataList/QuoteItemLaborDataList.cs
+++ b/server/AyaNova/DataList/QuoteItemLaborDataList.cs
@@ -203,7 +203,7 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "aquoteitem.tags"
diff --git a/server/AyaNova/DataList/QuoteItemLoanDataList.cs b/server/AyaNova/DataList/QuoteItemLoanDataList.cs
index 63705e3a..4e92d2cf 100644
--- a/server/AyaNova/DataList/QuoteItemLoanDataList.cs
+++ b/server/AyaNova/DataList/QuoteItemLoanDataList.cs
@@ -192,7 +192,7 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "aquoteitem.tags"
diff --git a/server/AyaNova/DataList/QuoteItemOutsideServiceDataList.cs b/server/AyaNova/DataList/QuoteItemOutsideServiceDataList.cs
index e7aef718..ef550da8 100644
--- a/server/AyaNova/DataList/QuoteItemOutsideServiceDataList.cs
+++ b/server/AyaNova/DataList/QuoteItemOutsideServiceDataList.cs
@@ -207,7 +207,7 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "aquoteitem.tags"
diff --git a/server/AyaNova/DataList/QuoteItemPartDataList.cs b/server/AyaNova/DataList/QuoteItemPartDataList.cs
index 328f303f..e4bd3d1a 100644
--- a/server/AyaNova/DataList/QuoteItemPartDataList.cs
+++ b/server/AyaNova/DataList/QuoteItemPartDataList.cs
@@ -192,7 +192,7 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "aquoteitem.tags"
diff --git a/server/AyaNova/DataList/QuoteItemScheduledUserDataList.cs b/server/AyaNova/DataList/QuoteItemScheduledUserDataList.cs
index 0bab2050..91472af7 100644
--- a/server/AyaNova/DataList/QuoteItemScheduledUserDataList.cs
+++ b/server/AyaNova/DataList/QuoteItemScheduledUserDataList.cs
@@ -172,7 +172,7 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "aquoteitem.tags"
diff --git a/server/AyaNova/DataList/QuoteItemTaskDataList.cs b/server/AyaNova/DataList/QuoteItemTaskDataList.cs
index 003f3f68..870facb3 100644
--- a/server/AyaNova/DataList/QuoteItemTaskDataList.cs
+++ b/server/AyaNova/DataList/QuoteItemTaskDataList.cs
@@ -160,7 +160,7 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "aquoteitem.tags"
diff --git a/server/AyaNova/DataList/QuoteItemTravelDataList.cs b/server/AyaNova/DataList/QuoteItemTravelDataList.cs
index 9af61a76..341cdaa1 100644
--- a/server/AyaNova/DataList/QuoteItemTravelDataList.cs
+++ b/server/AyaNova/DataList/QuoteItemTravelDataList.cs
@@ -189,7 +189,7 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "aquoteitem.tags"
diff --git a/server/AyaNova/DataList/QuoteItemUnitDataList.cs b/server/AyaNova/DataList/QuoteItemUnitDataList.cs
index ec77be0c..a2e46291 100644
--- a/server/AyaNova/DataList/QuoteItemUnitDataList.cs
+++ b/server/AyaNova/DataList/QuoteItemUnitDataList.cs
@@ -159,7 +159,7 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "aquoteitem.tags"
diff --git a/server/AyaNova/DataList/WorkOrderItemDataList.cs b/server/AyaNova/DataList/WorkOrderItemDataList.cs
index 63cdbe34..594fe6f3 100644
--- a/server/AyaNova/DataList/WorkOrderItemDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemDataList.cs
@@ -22,14 +22,14 @@ namespace AyaNova.DataList
 
             var RoleSet = BizRoles.GetRoleSet(DefaultListAType);
             AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change;
-            DefaultColumns = new List<string>() { 
+            DefaultColumns = new List<string>() {
                 "WorkOrderSerialNumber",
                 "WorkOrderItemSequence",
-                "WorkOrderItemSummary",              
-                "WorkOrderItemWorkOrderStatusID", 
-                "WorkOrderItemPriorityID",               
-                "Customer", 
-                "WorkOrderServiceDate" 
+                "WorkOrderItemSummary",
+                "WorkOrderItemWorkOrderStatusID",
+                "WorkOrderItemPriorityID",
+                "Customer",
+                "WorkOrderServiceDate"
                 };
             DefaultSortBy = new Dictionary<string, string>() { { "WorkOrderSerialNumber", "-" }, { "WorkOrderItemSequence", "+" } };
             FieldDefinitions = new List<DataListFieldDefinition>();
@@ -79,8 +79,9 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
+                TKeySection = "WorkOrderItem",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "aworkorderitem.tags"
             });
@@ -219,6 +220,7 @@ namespace AyaNova.DataList
             {
                 TKey = "Tags",
                 FieldKey = "workordertags",
+                TKeySection = "WorkOrder",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "viewworkorder.tags"
             });
@@ -389,7 +391,7 @@ namespace AyaNova.DataList
                 SqlValueColumnName = "viewworkorder.longitude"
             });
 
-         
+
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
diff --git a/server/AyaNova/DataList/WorkOrderItemExpenseDataList.cs b/server/AyaNova/DataList/WorkOrderItemExpenseDataList.cs
index e3502a57..3861525a 100644
--- a/server/AyaNova/DataList/WorkOrderItemExpenseDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemExpenseDataList.cs
@@ -185,8 +185,9 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
+                TKeySection = "WorkOrderItem",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "aworkorderitem.tags"
             });
@@ -317,6 +318,7 @@ namespace AyaNova.DataList
             {
                 TKey = "Tags",
                 FieldKey = "workordertags",
+                TKeySection = "WorkOrder",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "viewworkorder.tags"
             });
diff --git a/server/AyaNova/DataList/WorkOrderItemLaborDataList.cs b/server/AyaNova/DataList/WorkOrderItemLaborDataList.cs
index 1192d5cd..eb817a32 100644
--- a/server/AyaNova/DataList/WorkOrderItemLaborDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemLaborDataList.cs
@@ -202,8 +202,9 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
+                TKeySection = "WorkOrderItem",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "aworkorderitem.tags"
             });
@@ -334,6 +335,7 @@ namespace AyaNova.DataList
             {
                 TKey = "Tags",
                 FieldKey = "workordertags",
+                TKeySection = "WorkOrder",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "viewworkorder.tags"
             });
diff --git a/server/AyaNova/DataList/WorkOrderItemLoanDataList.cs b/server/AyaNova/DataList/WorkOrderItemLoanDataList.cs
index 9b0c59e0..3ce7775b 100644
--- a/server/AyaNova/DataList/WorkOrderItemLoanDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemLoanDataList.cs
@@ -190,8 +190,9 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
+                TKeySection = "WorkOrderItem",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "aworkorderitem.tags"
             });
@@ -322,6 +323,7 @@ namespace AyaNova.DataList
             {
                 TKey = "Tags",
                 FieldKey = "workordertags",
+                TKeySection = "WorkOrder",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "viewworkorder.tags"
             });
diff --git a/server/AyaNova/DataList/WorkOrderItemOutsideServiceDataList.cs b/server/AyaNova/DataList/WorkOrderItemOutsideServiceDataList.cs
index 9015df6a..39a141dd 100644
--- a/server/AyaNova/DataList/WorkOrderItemOutsideServiceDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemOutsideServiceDataList.cs
@@ -204,8 +204,9 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
+                TKeySection = "WorkOrderItem",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "aworkorderitem.tags"
             });
@@ -336,6 +337,7 @@ namespace AyaNova.DataList
             {
                 TKey = "Tags",
                 FieldKey = "workordertags",
+                TKeySection = "WorkOrder",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "viewworkorder.tags"
             });
diff --git a/server/AyaNova/DataList/WorkOrderItemPartDataList.cs b/server/AyaNova/DataList/WorkOrderItemPartDataList.cs
index 756194ab..15516d1d 100644
--- a/server/AyaNova/DataList/WorkOrderItemPartDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemPartDataList.cs
@@ -192,8 +192,9 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
+                TKeySection = "WorkOrderItem",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "aworkorderitem.tags"
             });
@@ -324,6 +325,7 @@ namespace AyaNova.DataList
             {
                 TKey = "Tags",
                 FieldKey = "workordertags",
+                TKeySection = "WorkOrder",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "viewworkorder.tags"
             });
diff --git a/server/AyaNova/DataList/WorkOrderItemPartRequestDataList.cs b/server/AyaNova/DataList/WorkOrderItemPartRequestDataList.cs
index 50d9e5cc..13293ed4 100644
--- a/server/AyaNova/DataList/WorkOrderItemPartRequestDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemPartRequestDataList.cs
@@ -225,8 +225,9 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
+                TKeySection = "WorkOrderItem",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "aworkorderitem.tags"
             });
@@ -357,6 +358,7 @@ namespace AyaNova.DataList
             {
                 TKey = "Tags",
                 FieldKey = "workordertags",
+                TKeySection = "WorkOrder",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "viewworkorder.tags"
             });
diff --git a/server/AyaNova/DataList/WorkOrderItemScheduledUserDataList.cs b/server/AyaNova/DataList/WorkOrderItemScheduledUserDataList.cs
index 3b8bd4fa..37cfb1ac 100644
--- a/server/AyaNova/DataList/WorkOrderItemScheduledUserDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemScheduledUserDataList.cs
@@ -173,8 +173,9 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
+                TKeySection = "WorkOrderItem",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "aworkorderitem.tags"
             });
@@ -305,6 +306,7 @@ namespace AyaNova.DataList
             {
                 TKey = "Tags",
                 FieldKey = "workordertags",
+                TKeySection = "WorkOrder",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "viewworkorder.tags"
             });
diff --git a/server/AyaNova/DataList/WorkOrderItemTaskDataList.cs b/server/AyaNova/DataList/WorkOrderItemTaskDataList.cs
index f0ae52c0..5e9af873 100644
--- a/server/AyaNova/DataList/WorkOrderItemTaskDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemTaskDataList.cs
@@ -160,8 +160,9 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
+                TKeySection = "WorkOrderItem",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "aworkorderitem.tags"
             });
@@ -292,6 +293,7 @@ namespace AyaNova.DataList
             {
                 TKey = "Tags",
                 FieldKey = "workordertags",
+                TKeySection = "WorkOrder",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "viewworkorder.tags"
             });
diff --git a/server/AyaNova/DataList/WorkOrderItemTravelDataList.cs b/server/AyaNova/DataList/WorkOrderItemTravelDataList.cs
index 3c34eab7..04774598 100644
--- a/server/AyaNova/DataList/WorkOrderItemTravelDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemTravelDataList.cs
@@ -188,8 +188,9 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
+                TKeySection = "WorkOrderItem",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "aworkorderitem.tags"
             });
@@ -320,6 +321,7 @@ namespace AyaNova.DataList
             {
                 TKey = "Tags",
                 FieldKey = "workordertags",
+                TKeySection = "WorkOrder",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "viewworkorder.tags"
             });
diff --git a/server/AyaNova/DataList/WorkOrderItemUnitDataList.cs b/server/AyaNova/DataList/WorkOrderItemUnitDataList.cs
index 1b4f0260..f7dec2f1 100644
--- a/server/AyaNova/DataList/WorkOrderItemUnitDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemUnitDataList.cs
@@ -73,7 +73,14 @@ namespace AyaNova.DataList
                 SqlValueColumnName = "aworkorderitemunit.notes"
             });
 
-
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "WorkOrderItemUnitTags",
+                FieldKey = "WorkOrderItemUnitTags",
+                TKeySection = "WorkOrderItemUnit",
+                UiFieldDataType = (int)UiFieldDataType.Tags,
+                SqlValueColumnName = "aworkorderitemunit.tags"
+            });
 
             FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderItemUnitCustom1", FieldKey = "workorderitemunitcustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorderitemunit.customfields", TKeySection = "WorkOrderItemUnit" });
             FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderItemUnitCustom2", FieldKey = "workorderitemunitcustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorderitemunit.customfields", TKeySection = "WorkOrderItemUnit" });
@@ -158,8 +165,9 @@ namespace AyaNova.DataList
 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                 FieldKey = "WorkOrderItemTags",
+                TKeySection = "WorkOrderItem",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "aworkorderitem.tags"
             });
@@ -290,6 +298,7 @@ namespace AyaNova.DataList
             {
                 TKey = "Tags",
                 FieldKey = "workordertags",
+                TKeySection = "WorkOrder",
                 UiFieldDataType = (int)UiFieldDataType.Tags,
                 SqlValueColumnName = "viewworkorder.tags"
             });
@@ -526,7 +535,7 @@ namespace AyaNova.DataList
             //ClientCriteria format for this list is "OBJECTID,AYATYPE" 
             var crit = (clientCriteria ?? "").Split(',').Select(z => z.Trim()).ToArray();
             if (crit.Length > 1)
-            {                
+            {
                 int nType = 0;
                 if (!int.TryParse(crit[1], out nType)) return ret;
                 AyaType forType = (AyaType)nType;
diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json
index b5122888..5cce0caf 100644
--- a/server/AyaNova/resource/de.json
+++ b/server/AyaNova/resource/de.json
@@ -568,7 +568,7 @@
   "WorkOrderItemTask": "Arbeitsauftragsposten - Aufgabe",
   "WorkOrderItemTravel": "Arbeitsauftragsposten - Reisen",
   "WorkOrderItemType": "Arbeitsauftragspostentyp",
-  "WorkOrderItemUnit": "WorkOrder item unit",
+  "WorkOrderItemUnit": "Arbeitsauftragsposition - Einheit",
   "PM": "Wartung/Inspektion",
   "PMTemplate": "Wartung/Inspektion vorlage",
   "Quote": "Angebot",
@@ -1691,10 +1691,10 @@
   "RowsPerPage": "Zeilen pro Seite",
   "PageOfPageText": "{0}-{1} von {2}",
   "Loading": "Wird geladen...",
-  "Tags": "Kategorien",
-  "Tag": "Tag",
-  "TaggedWith": "Markiert mit",
-  "NotTaggedWith": "Nicht markiert mit",
+  "Tags": "Etiketts",
+  "Tag": "Etikett",
+  "TaggedWith": "Etikett mit",
+  "NotTaggedWith": "Nicht etikett mit",
   "UserTypeServiceContractor": "Subunternehmer",
   "AuthorizationRoles": "Autorisierungsrollen",
   "AuthorizationRoleNoRole": "Keine Rolle",
@@ -2302,5 +2302,7 @@
   "ErrorGenBeforeTooSmall":"Muss kleiner sein als Wiederholungsintervall",
   "ErrorRepeatIntervalTooSmall":"Mindestens eine Stunde",
   "QuantityRequired":"Erforderliche Menge",
-  "InventoryRoleRequired":"Der Benutzer muss für diesen Vorgang eine Inventarrolle haben"
+  "InventoryRoleRequired":"Der Benutzer muss für diesen Vorgang eine Inventarrolle haben",
+  "WorkOrderItemTags":"Etikett Arbeitsauftragsposten",
+  "WorkOrderItemUnitTags":"Etikett Arbeitsauftragsposition - Einheit"
 }
\ No newline at end of file
diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json
index caa0afd9..2d0e3045 100644
--- a/server/AyaNova/resource/en.json
+++ b/server/AyaNova/resource/en.json
@@ -2302,6 +2302,8 @@
   "ErrorGenBeforeTooSmall":"Must be smaller than Repeat interval",
   "ErrorRepeatIntervalTooSmall":"Minimum one hour",
   "QuantityRequired":"Quantity required",
-  "InventoryRoleRequired":"User must have Inventory Role for this operation"
+  "InventoryRoleRequired":"User must have Inventory Role for this operation",
+  "WorkOrderItemTags":"WO Item Tags",
+  "WorkOrderItemUnitTags":"WO Item Unit Tags"
 
 }
\ No newline at end of file
diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json
index 20bee289..d51375a4 100644
--- a/server/AyaNova/resource/es.json
+++ b/server/AyaNova/resource/es.json
@@ -567,7 +567,7 @@
   "WorkOrderItemTask": "Tarea elemento de pedido",
   "WorkOrderItemTravel": "Elemento de pedido desplazamiento",
   "WorkOrderItemType": "Tipo de elemento de pedido",
-  "WorkOrderItemUnit": "WorkOrder item unit",
+  "WorkOrderItemUnit": "Artículo de pedido unitario",
   "PM": "Mantenimiento preventivo",
   "PMTemplate": "Plantilla mantenimiento preventivo",
   "Quote": "Presupuesto",
@@ -2302,5 +2302,7 @@
   "ErrorGenBeforeTooSmall":"Debe ser menor que el intervalo de repetición",
   "ErrorRepeatIntervalTooSmall":"Mínimo una hora",
   "QuantityRequired":"Cantidad requerida",
-  "InventoryRoleRequired":"El usuario debe tener un rol de inventario para esta operación"
+  "InventoryRoleRequired":"El usuario debe tener un rol de inventario para esta operación",
+  "WorkOrderItemTags":"Etiquetas elemento del pedido",
+  "WorkOrderItemUnitTags":"Etiquetas artículo de pedido unitario"
 }
\ No newline at end of file
diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json
index 3349fc8d..a4e9b60d 100644
--- a/server/AyaNova/resource/fr.json
+++ b/server/AyaNova/resource/fr.json
@@ -556,7 +556,7 @@
   "UserSkillAssigned": "Aptitude d'utilisateur attribuée",
   "Vendor": "Fournisseur",
   "WorkOrder": "Bon de travail",
-  "WorkOrderClose": "Close work order",
+  "WorkOrderClose": "Fermer le bon de travail",
   "WorkOrderCategory": "Catégorie de bons de travail",
   "WorkOrderItem": "Élément de bon de travail",
   "WorkOrderItemLabor": "Main d'oeuvre d'élément de bon de travail",
@@ -568,7 +568,7 @@
   "WorkOrderItemTask": "Tâche d'élément de bon de travail",
   "WorkOrderItemTravel": "Déplacement d'élément de bon de travail",
   "WorkOrderItemType": "Type d'élément de bon de travail",
-  "WorkOrderItemUnit": "WorkOrder item unit",
+  "WorkOrderItemUnit": "Article de l'ordre de travail - unité",
   "PM": "Entretien préventif",
   "PMTemplate": "Modèle d'entretien préventif",
   "Quote": "Devis",
@@ -2302,5 +2302,7 @@
   "ErrorGenBeforeTooSmall":"Doit être inférieur à l'intervalle de répétition",
   "ErrorRepeatIntervalTooSmall":"Au moins une heure",
   "QuantityRequired":"Quantité Nécessaire",
-  "InventoryRoleRequired":"L'utilisateur doit avoir un rôle d'inventaire pour cette opération"
+  "InventoryRoleRequired":"L'utilisateur doit avoir un rôle d'inventaire pour cette opération",
+  "WorkOrderItemTags":"Balises Élément de bon de travail",
+  "WorkOrderItemUnitTags":"Balises Article de l'ordre de travail - unité"
 }
\ No newline at end of file