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/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs
index 5c52da93..ad2db8c5 100644
--- a/server/AyaNova/biz/FormFieldReference.cs
+++ b/server/AyaNova/biz/FormFieldReference.cs
@@ -898,7 +898,7 @@ namespace AyaNova.Biz
                     l.Add(new FormField { TKey = "WorkOrderItemExpenseList", FieldKey = "WorkOrderItemExpenseList", TKeySection = "WorkOrderItem", Requireable = false });
                     l.Add(new FormField { TKey = "WorkOrderItemLaborList", FieldKey = "WorkOrderItemLaborList", TKeySection = "WorkOrderItem", Requireable = false });
                     l.Add(new FormField { TKey = "WorkOrderItemTravelList", FieldKey = "WorkOrderItemTravelList", TKeySection = "WorkOrderItem", Requireable = false });
-                    l.Add(new FormField { TKey = "WorkOrderItemTaskList", FieldKey = "WorkOrderItemTaskList", TKeySection = "WorkOrderItem", Requireable = false });
+                    l.Add(new FormField { TKey = "WorkOrderItemTasks", FieldKey = "WorkOrderItemTasks", TKeySection = "WorkOrderItem", Requireable = false });
 
                     //WORKORDER ITEM SCHEDULED USER
                     l.Add(new FormField { TKey = "WorkOrderItemScheduledUserEstimatedQuantity", FieldKey = "WorkOrderItemScheduledUserEstimatedQuantity", TKeySection = "WorkOrderItemScheduledUser" });
diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs
index d8a99f44..42c6b089 100644
--- a/server/AyaNova/biz/WorkOrderBiz.cs
+++ b/server/AyaNova/biz/WorkOrderBiz.cs
@@ -171,7 +171,7 @@ namespace AyaNova.Biz
             .Include(w => w.Items)
                 .ThenInclude(wi => wi.ScheduledUsers)
             .Include(w => w.Items)
-                .ThenInclude(wi => wi.Tasks)
+                .ThenInclude(wi => wi.Tasks.OrderBy(t => t.Sequence))
             .Include(w => w.Items)
                 .ThenInclude(wi => wi.Travels)
             .Include(w => w.Items)
@@ -568,7 +568,7 @@ namespace AyaNova.Biz
             .Include(w => w.Items)
                 .ThenInclude(wi => wi.ScheduledUsers)
             .Include(w => w.Items)
-                .ThenInclude(wi => wi.Tasks)
+                .ThenInclude(wi => wi.Tasks.OrderBy(t => t.Sequence))
             .Include(w => w.Items)
                 .ThenInclude(wi => wi.Travels)
             .Include(w => w.Items)