diff --git a/ayanova/src/components/work-order-item-parts.vue b/ayanova/src/components/work-order-item-parts.vue
index a6d52d05..b7e12d46 100644
--- a/ayanova/src/components/work-order-item-parts.vue
+++ b/ayanova/src/components/work-order-item-parts.vue
@@ -107,13 +107,7 @@
           }}<v-icon right large>$ayiTrashRestoreAlt</v-icon></v-btn
         >
 
-        <v-col
-          v-if="form().showMe(this, 'WorkOrderItemPartPartID')"
-          cols="12"
-          sm="6"
-          lg="4"
-          xl="3"
-        >
+        <v-col cols="12" sm="6" lg="4" xl="3">
           <gz-pick-list
             :ref="
               `Items[${activeWoItemIndex}].parts[${activeItemIndex}].partId`
@@ -579,13 +573,12 @@ export default {
     headerList: function() {
       const headers = [];
 
-      if (this.form().showMe(this, "WorkOrderItemPartPartID")) {
-        headers.push({
-          text: this.$ay.t("WorkOrderItemPartPartID"),
-          align: "left",
-          value: "partNameViz"
-        });
-      }
+//always required
+      headers.push({
+        text: this.$ay.t("WorkOrderItemPartPartID"),
+        align: "left",
+        value: "partNameViz"
+      });
 
       if (
         this.pvm.useInventory &&
diff --git a/ayanova/src/components/work-order-item-tasks.vue b/ayanova/src/components/work-order-item-tasks.vue
index b29b4da2..e412be28 100644
--- a/ayanova/src/components/work-order-item-tasks.vue
+++ b/ayanova/src/components/work-order-item-tasks.vue
@@ -97,7 +97,7 @@
         >
 
         <v-col
-          v-if="form().showMe(this, 'WorkOrderItemTaskSequence')"
+          v-if="form().showMe(this, 'Sequence')"
           cols="12"
           sm="6"
           lg="4"
@@ -135,12 +135,7 @@
         </v-col>
 
         <v-col
-          v-if="
-            form().showMe(
-              this,
-              'WorkOrderItemTaskWorkOrderItemTaskCompletionType'
-            )
-          "
+          v-if="form().showMe(this, 'Status')"
           cols="12"
           sm="6"
           lg="4"
@@ -182,7 +177,7 @@
         </v-col>
 
         <v-col
-          v-if="form().showMe(this, 'WorkOrderItemTaskUser')"
+          v-if="form().showMe(this, 'CompletedByUserId')"
           cols="12"
           sm="6"
           lg="4"
@@ -221,7 +216,7 @@
         </v-col>
 
         <v-col
-          v-if="form().showMe(this, 'WorkOrderItemTaskCompletedDate')"
+          v-if="form().showMe(this, 'CompletedDate')"
           cols="12"
           sm="6"
           lg="4"
@@ -253,7 +248,7 @@
           ></gz-date-time-picker>
         </v-col>
 
-        <v-col v-if="form().showMe(this, 'WorkOrderItemTaskTaskID')" cols="12">
+        <v-col cols="12">
           <v-textarea
             :ref="`Items[${activeWoItemIndex}].tasks[${activeItemIndex}].task`"
             v-model="value.items[activeWoItemIndex].tasks[activeItemIndex].task"
@@ -371,7 +366,7 @@ export default {
     headerList: function() {
       const headers = [];
 
-      if (this.form().showMe(this, "WorkOrderItemTaskSequence")) {
+      if (this.form().showMe(this, "Sequence")) {
         headers.push({
           text: this.$ay.t("Sequence"),
           align: "left",
@@ -379,15 +374,14 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "WorkOrderItemTaskTaskID")) {
-        headers.push({
-          text: this.$ay.t("WorkOrderItemTaskTaskID"),
-          align: "start",
-          value: "task"
-        });
-      }
+      //always required
+      headers.push({
+        text: this.$ay.t("WorkOrderItemTaskTaskID"),
+        align: "start",
+        value: "task"
+      });
 
-      if (this.form().showMe(this, "WorkOrderItemTaskUser")) {
+      if (this.form().showMe(this, "CompletedByUserId")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemTaskUser"),
           align: "start",
@@ -395,12 +389,7 @@ export default {
         });
       }
 
-      if (
-        this.form().showMe(
-          this,
-          "WorkOrderItemTaskWorkOrderItemTaskCompletionType"
-        )
-      ) {
+      if (this.form().showMe(this, "Status")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemTaskWorkOrderItemTaskCompletionType"),
           align: "start",
@@ -408,7 +397,7 @@ export default {
         });
       }
 
-      if (this.form().showMe(this, "WorkOrderItemTaskCompletedDate")) {
+      if (this.form().showMe(this, "CompletedDate")) {
         headers.push({
           text: this.$ay.t("WorkOrderItemTaskCompletedDate"),
           align: "right",