diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs
index 84fed279..3f727f31 100644
--- a/server/AyaNova/biz/WorkOrderBiz.cs
+++ b/server/AyaNova/biz/WorkOrderBiz.cs
@@ -1585,6 +1585,7 @@ namespace AyaNova.Biz
 
             var WorkorderInfo = await ct.WorkOrder.AsNoTracking().Where(x => x.Id == oProposed.WorkOrderId).Select(x => new { x.Serial, x.Tags, x.CustomerId }).FirstOrDefaultAsync();
             WorkOrderStatus wos = await ct.WorkOrderStatus.AsNoTracking().FirstOrDefaultAsync(x => x.Id == oProposed.WorkOrderStatusId);
+            //for notification purposes because has no name / tags field itself
             oProposed.Name = WorkorderInfo.Serial.ToString();
             oProposed.Tags = WorkorderInfo.Tags;
 
@@ -2183,6 +2184,7 @@ namespace AyaNova.Biz
 
             var wid = await GetWorkOrderIdFromRelativeAsync(AyaType.WorkOrderItem, oProposed.WorkOrderId, ct);
             var WorkorderInfo = await ct.WorkOrder.AsNoTracking().Where(x => x.Id == wid.WorkOrderId).Select(x => new { Serial = x.Serial, Tags = x.Tags }).FirstOrDefaultAsync();
+             //for notification purposes because has no name field itself
             oProposed.Name = WorkorderInfo.Serial.ToString();
 
             //STANDARD EVENTS FOR ALL OBJECTS
@@ -2557,8 +2559,7 @@ namespace AyaNova.Biz
             bool isNew = currentObj == null;
             WorkOrderItemExpense oProposed = (WorkOrderItemExpense)proposedObj;
             var wid = await GetWorkOrderIdFromRelativeAsync(AyaType.WorkOrderItem, oProposed.WorkOrderItemId, ct);
-            var WorkorderInfo = await ct.WorkOrder.AsNoTracking().Where(x => x.Id == wid.WorkOrderId).Select(x => new { Serial = x.Serial, Tags = x.Tags }).FirstOrDefaultAsync();
-            oProposed.Name = WorkorderInfo.Serial.ToString();
+            var WorkorderInfo = await ct.WorkOrder.AsNoTracking().Where(x => x.Id == wid.WorkOrderId).Select(x => new { Serial = x.Serial, Tags = x.Tags }).FirstOrDefaultAsync();          
             oProposed.Tags = WorkorderInfo.Tags;
 
             //STANDARD EVENTS FOR ALL OBJECTS
@@ -3048,6 +3049,7 @@ namespace AyaNova.Biz
             WorkOrderItemLabor oProposed = (WorkOrderItemLabor)proposedObj;
             var wid = await GetWorkOrderIdFromRelativeAsync(AyaType.WorkOrderItem, oProposed.WorkOrderItemId, ct);
             var WorkorderInfo = await ct.WorkOrder.AsNoTracking().Where(x => x.Id == wid.WorkOrderId).Select(x => new { Serial = x.Serial, Tags = x.Tags }).FirstOrDefaultAsync();
+             //for notification purposes because has no name or tags field itself
             oProposed.Name = WorkorderInfo.Serial.ToString();
             oProposed.Tags = WorkorderInfo.Tags;
 
@@ -3427,6 +3429,7 @@ namespace AyaNova.Biz
             WorkOrderItemLoan oProposed = (WorkOrderItemLoan)proposedObj;
             var wid = await GetWorkOrderIdFromRelativeAsync(AyaType.WorkOrderItem, oProposed.WorkOrderItemId, ct);
             var WorkorderInfo = await ct.WorkOrder.AsNoTracking().Where(x => x.Id == wid.WorkOrderId).Select(x => new { Serial = x.Serial, Tags = x.Tags }).FirstOrDefaultAsync();
+             //for notification purposes because has no name / tags field itself
             oProposed.Name = WorkorderInfo.Serial.ToString();
             oProposed.Tags = WorkorderInfo.Tags;
 
@@ -3742,7 +3745,8 @@ namespace AyaNova.Biz
             WorkOrderItemOutsideService oProposed = (WorkOrderItemOutsideService)proposedObj;
             var wid = await GetWorkOrderIdFromRelativeAsync(AyaType.WorkOrderItem, oProposed.WorkOrderItemId, ct);
             var WorkorderInfo = await ct.WorkOrder.AsNoTracking().Where(x => x.Id == wid.WorkOrderId).Select(x => new { Serial = x.Serial, Tags = x.Tags }).FirstOrDefaultAsync();
-            oProposed.Name = WorkorderInfo.Serial.ToString();
+            //for notification purposes because has no name / tags field itself
+            oProposed.Name = WorkorderInfo.Serial.ToString(); 
             oProposed.Tags = WorkorderInfo.Tags;
 
             //STANDARD EVENTS FOR ALL OBJECTS
@@ -4473,7 +4477,7 @@ namespace AyaNova.Biz
             WorkOrderItemPart oProposed = (WorkOrderItemPart)proposedObj;
             var wid = await GetWorkOrderIdFromRelativeAsync(AyaType.WorkOrderItem, oProposed.WorkOrderItemId, ct);
             var WorkorderInfo = await ct.WorkOrder.AsNoTracking().Where(x => x.Id == wid.WorkOrderId).Select(x => new { Serial = x.Serial, Tags = x.Tags }).FirstOrDefaultAsync();
-            oProposed.Name = WorkorderInfo.Serial.ToString();
+            oProposed.Name = WorkorderInfo.Serial.ToString(); //for notification purposes because has no name / tags field itself
             oProposed.Tags = WorkorderInfo.Tags;
 
             //STANDARD EVENTS FOR ALL OBJECTS
@@ -4992,8 +4996,8 @@ namespace AyaNova.Biz
             WorkOrderItemScheduledUser oProposed = (WorkOrderItemScheduledUser)proposedObj;
             var wid = await GetWorkOrderIdFromRelativeAsync(AyaType.WorkOrderItem, oProposed.WorkOrderItemId, ct);
             var WorkorderInfo = await ct.WorkOrder.AsNoTracking().Where(x => x.Id == wid.WorkOrderId).Select(x => new { Serial = x.Serial, Tags = x.Tags }).FirstOrDefaultAsync();
-            oProposed.Name = WorkorderInfo.Serial.ToString();
-            oProposed.Tags = WorkorderInfo.Tags;
+            oProposed.Name = WorkorderInfo.Serial.ToString(); //for notification purposes because has no name field itself
+            oProposed.Tags = WorkorderInfo.Tags; //for notification purposes because has no tag field itself
 
             //STANDARD EVENTS FOR ALL OBJECTS
             await NotifyEventHelper.ProcessStandardObjectEvents(ayaEvent, proposedObj, ct);
@@ -5375,7 +5379,7 @@ namespace AyaNova.Biz
             WorkOrderItemTask oProposed = (WorkOrderItemTask)proposedObj;
             var wid = await GetWorkOrderIdFromRelativeAsync(AyaType.WorkOrderItem, oProposed.WorkOrderItemId, ct);
             var WorkorderInfo = await ct.WorkOrder.AsNoTracking().Where(x => x.Id == wid.WorkOrderId).Select(x => new { Serial = x.Serial, Tags = x.Tags }).FirstOrDefaultAsync();
-            oProposed.Name = WorkorderInfo.Serial.ToString();
+            oProposed.Name = WorkorderInfo.Serial.ToString(); //for notification purposes because has no name / tags field itself
             oProposed.Tags = WorkorderInfo.Tags;
 
             //STANDARD EVENTS FOR ALL OBJECTS
@@ -5827,7 +5831,7 @@ namespace AyaNova.Biz
             WorkOrderItemTravel oProposed = (WorkOrderItemTravel)proposedObj;
             var wid = await GetWorkOrderIdFromRelativeAsync(AyaType.WorkOrderItem, oProposed.WorkOrderItemId, ct);
             var WorkorderInfo = await ct.WorkOrder.AsNoTracking().Where(x => x.Id == wid.WorkOrderId).Select(x => new { Serial = x.Serial, Tags = x.Tags }).FirstOrDefaultAsync();
-            oProposed.Name = WorkorderInfo.Serial.ToString();
+            oProposed.Name = WorkorderInfo.Serial.ToString();//for notification purposes because has no name / tags field itself
             oProposed.Tags = WorkorderInfo.Tags;
 
             //STANDARD EVENTS FOR ALL OBJECTS
@@ -6092,7 +6096,7 @@ namespace AyaNova.Biz
             WorkOrderItemUnit oProposed = (WorkOrderItemUnit)proposedObj;
             var wid = await GetWorkOrderIdFromRelativeAsync(AyaType.WorkOrderItem, oProposed.WorkOrderItemId, ct);
             var WorkorderInfo = await ct.WorkOrder.AsNoTracking().Where(x => x.Id == wid.WorkOrderId).Select(x => new { Serial = x.Serial, Tags = x.Tags }).FirstOrDefaultAsync();
-            oProposed.Name = WorkorderInfo.Serial.ToString();
+            oProposed.Name = WorkorderInfo.Serial.ToString();//for notification purposes because has no name field itself
 
             //STANDARD EVENTS FOR ALL OBJECTS
             await NotifyEventHelper.ProcessStandardObjectEvents(ayaEvent, proposedObj, ct);
diff --git a/server/AyaNova/models/WorkOrderItemScheduledUser.cs b/server/AyaNova/models/WorkOrderItemScheduledUser.cs
index 7212c3a7..6041ee27 100644
--- a/server/AyaNova/models/WorkOrderItemScheduledUser.cs
+++ b/server/AyaNova/models/WorkOrderItemScheduledUser.cs
@@ -21,8 +21,8 @@ namespace AyaNova.Models
         [NotMapped]
         public string ServiceRateViz { get; set; }
 
-     
-//workaround for notification        
+
+        //workaround for notification        
         [NotMapped, JsonIgnore]
         public List<string> Tags { get; set; } = new List<string>();
         [NotMapped, JsonIgnore]
diff --git a/server/AyaNova/models/WorkOrderItemTask.cs b/server/AyaNova/models/WorkOrderItemTask.cs
index 1eb46316..48a09b49 100644
--- a/server/AyaNova/models/WorkOrderItemTask.cs
+++ b/server/AyaNova/models/WorkOrderItemTask.cs
@@ -27,12 +27,12 @@ namespace AyaNova.Models
         public string CompletedByUserViz { get; set; }
         public DateTime? CompletedDate { get; set; }
 
-      //workaround for notification        
+        //workaround for notification        
         [NotMapped, JsonIgnore]
         public List<string> Tags { get; set; } = new List<string>();
         [NotMapped, JsonIgnore]
         public string Name { get; set; }
-        
+
         [Required]
         public long WorkOrderItemId { get; set; }
         [JsonIgnore]