diff --git a/.vscode/launch.json b/.vscode/launch.json
index 8fd97968..0e2049e9 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -53,7 +53,7 @@
         "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
         "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
         "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
-        "AYANOVA_SERVER_TEST_MODE": "true",
+        "AYANOVA_SERVER_TEST_MODE": "false",
         "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
         "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7",
         "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\"
diff --git a/server/AyaNova/Controllers/WorkOrderController.cs b/server/AyaNova/Controllers/WorkOrderController.cs
index ade56653..3894382e 100644
--- a/server/AyaNova/Controllers/WorkOrderController.cs
+++ b/server/AyaNova/Controllers/WorkOrderController.cs
@@ -566,7 +566,7 @@ namespace AyaNova.Api.Controllers
         ///
         /// </summary>       
         /// <param name="updatedObject">WorkOrderItemLabor - top level only, no descendants</param>
-        /// <returns>New concurrency token</returns>
+        /// <returns>Updated object</returns>
         [HttpPut("items/labors")]
         public async Task<IActionResult> PutWorkOrderItemLabor([FromBody] WorkOrderItemLabor updatedObject)
         {
@@ -585,7 +585,7 @@ namespace AyaNova.Api.Controllers
                 else
                     return BadRequest(new ApiErrorResponse(biz.Errors));
             }
-            return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));
+            return Ok(ApiOkResponse.Response(o));
         }
 
 
diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs
index d84d2286..94d1ad0c 100644
--- a/server/AyaNova/biz/WorkOrderBiz.cs
+++ b/server/AyaNova/biz/WorkOrderBiz.cs
@@ -1646,6 +1646,7 @@ namespace AyaNova.Biz
                 //newObject.CustomFields = JsonUtil.CompactJson(newObject.CustomFields);
                 await ct.WorkOrderItemLabor.AddAsync(newObject);
                 await ct.SaveChangesAsync();
+                newObject.IsDirty = false;
                 await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, newObject.Id, newObject.AyaType, AyaEvent.Created), ct);
                 await LaborSearchIndexAsync(newObject, true);
                 // await TagBiz.ProcessUpdateTagsInRepositoryAsync(ct, newObject.Tags, null);
@@ -1693,6 +1694,7 @@ namespace AyaNova.Biz
             try
             {
                 await ct.SaveChangesAsync();
+                putObject.IsDirty = false;
             }
             catch (DbUpdateConcurrencyException)
             {
@@ -1822,8 +1824,8 @@ namespace AyaNova.Biz
             //if modifed, see what has changed and should be re-applied
             if (ayaEvent == AyaEvent.Modified)
             {
-                //If it wasn't a service rate change there is no need to set pricing
-                if (newObj.ServiceRateId == oldObj.ServiceRateId)
+                //If it wasn't a service rate or quantity change there is no need to set pricing
+                if (newObj.ServiceRateId == oldObj.ServiceRateId && newObj.ServiceRateQuantity != oldObj.ServiceRateQuantity)
                 {
                     SetPrice = false;
                 }