diff --git a/app/Http/Controllers/FormController.php b/app/Http/Controllers/FormController.php
index 4537551d..e2e679cb 100644
--- a/app/Http/Controllers/FormController.php
+++ b/app/Http/Controllers/FormController.php
@@ -417,16 +417,17 @@ class FormController extends Controller
                     if (isset($question->type) && $question->type == 'hidden') {
                         continue;
                     }
+                    $col = is_object($question) && isset($question->code) ? $question->code : $code;
                     $value = null;
-                    if (isset($submission->formdata) && is_object($submission->formdata) && property_exists($submission->formdata, $code)) {
-                        $value = $submission->formdata->{$code};
-                    } elseif (isset($submission->{$code})) {
-                        $value = $submission->{$code};
+                    if (isset($submission->formdata) && is_object($submission->formdata) && property_exists($submission->formdata, $col)) {
+                        $value = $submission->formdata->{$col};
+                    } elseif (isset($submission->{$col})) {
+                        $value = $submission->{$col};
                     }
                     if (is_array($value)) {
                         $value = implode(', ', $value);
                     }
-                    $row[$code] = $value ?? '';
+                    $row[$col] = $value ?? '';
                 }
                 if (isset($formdata->workflow) && $formdata->workflow == 'yes') {
                     $row['workflow_next_approver'] = $submission->workflow_next_approver ?? '';
diff --git a/app/Http/Controllers/FormentityController.php b/app/Http/Controllers/FormentityController.php
index 7b7eb08e..86e0fd8b 100644
--- a/app/Http/Controllers/FormentityController.php
+++ b/app/Http/Controllers/FormentityController.php
@@ -61,6 +61,7 @@ class FormentityController extends Controller
             'status' => ['title' => 'Status', 'type' => 'select', 'required' => true, 'values' => ['active' => 'Active', 'disabled' => 'Disabled'] ],
             'metric_submission' => ['title' => 'Metric Submission', 'type' => 'yesno', 'required' => true],
             'metric_authkey' => ['title' => 'Auth Key', 'type' => 'text', 'required' => true],
+            'metric_ready_on_submit' => ['title' => 'Metric Ready On Submit', 'type' => 'yesno', 'required' => true, 'default' => 'no'],
 
             'manager_de_roles' => ['title' => 'Manager Data Entry Roles', 'type' => 'multiselect', 'values' => $roles_dd ],
             // 'manager_data_child_role' => ['title' => 'Manager Data Child Entry Roles', 'type' => 'multiselect', 'values' => $roles_dd ],
diff --git a/resources/views/form/list.blade.php b/resources/views/form/list.blade.php
index be9d0a52..e5250f91 100644
--- a/resources/views/form/list.blade.php
+++ b/resources/views/form/list.blade.php
@@ -255,7 +255,8 @@
                     @if(isset($question->type) && $question->type == 'hidden')
                         @continue
                     @endif
-                    { "data": "{{$code}}", "defaultContent": "" },
+                    @php $col = is_object($question) && isset($question->code) ? $question->code : $code; @endphp
+                    { "data": "{{$col}}", "defaultContent": "" },
                 @endforeach
                 @else
                 { "data": "date" },