diff --git a/ayanova/src/views/ay-data-list-view.vue b/ayanova/src/views/ay-data-list-view.vue
index 0a5e13fd..e747d5ef 100644
--- a/ayanova/src/views/ay-data-list-view.vue
+++ b/ayanova/src/views/ay-data-list-view.vue
@@ -70,6 +70,7 @@
                   <v-card-text>
                     <!-- INCLUDE CONTROL -->
                     <v-switch
+                      v-if="!item.rid"
                       v-model="item.include"
                       :label="lt('Include')"
                       :ref="item.key"
@@ -78,6 +79,9 @@
                       "
                       @change="includeChanged(item)"
                     ></v-switch>
+                    <div v-if="item.rid" class="v-label mb-7 mt-6">
+                      {{ lt("Include") }}
+                    </div>
                     <!-- RE-ORDER CONTROL -->
                     <div class="d-flex justify-space-between">
                       <v-btn large icon @click="move('start', index)"
@@ -1308,6 +1312,10 @@ function initDataObject(vm) {
       tempFilterValue: null
     };
 
+    if (fld.isRowId) {
+      o.rid = true;
+    }
+
     //If it's a tag and it's not been set yet it needs to have an empty array to stat with for the picker
     if (o.uiFieldDataType == 9 && o.tempFilterValue == null) {
       o.tempFilterValue = [];
@@ -1351,6 +1359,11 @@ function initDataObject(vm) {
         tempFilterToken: null,
         tempFilterValue: null
       };
+
+      if (fld.isRowId) {
+        o.rid = true;
+        o.include = true;
+      }
       //If it's a tag and it's not been set yet it needs to have an empty array to stat with for the picker
       if (o.uiFieldDataType == 9 && o.tempFilterValue == null) {
         o.tempFilterValue = [];
@@ -1361,7 +1374,7 @@ function initDataObject(vm) {
   vm.obj.editView = ret;
 
   if (window.$gz.errorHandler.devMode) {
-    if (vm.obj.editView.length != vm.fieldDefinitions.length - 1) {
+    if (vm.obj.editView.length != vm.fieldDefinitions.length) {
       throw "ay-data-list-view::initDataObject - working array length not equal to total field definition length";
     }
   }