diff --git a/forms-flow-ai/epd-forms/bundling/Site Risk Classification Report.json b/forms-flow-ai/epd-forms/bundling/Site Risk Classification Report.json
index cc30700e..1a4cbc51 100644
--- a/forms-flow-ai/epd-forms/bundling/Site Risk Classification Report.json	
+++ b/forms-flow-ai/epd-forms/bundling/Site Risk Classification Report.json	
@@ -10,6 +10,148 @@
                 "common"
             ],
             "components": [
+                {
+                    "label": "nomStatus",
+                    "customClass": "",
+                    "modalEdit": false,
+                    "defaultValue": null,
+                    "persistent": true,
+                    "protected": false,
+                    "dbIndex": false,
+                    "encrypted": false,
+                    "redrawOn": "",
+                    "customDefaultValue": "",
+                    "calculateValue": "value = false;\nif (data.applicationStatus ===  'Resubmit' || data.applicationStatus ===  'Resubmitted')\n{\n \tif (data.nomBundleStatus === 'SIA Returned')\n\t\tvalue = false;\n\telse\n\t\tvalue = true;\n}",
+                    "calculateServer": false,
+                    "key": "nomStatus",
+                    "tags": [],
+                    "properties": {},
+                    "logic": [],
+                    "attributes": {},
+                    "overlay": {
+                        "style": "",
+                        "page": "",
+                        "left": "",
+                        "top": "",
+                        "width": "",
+                        "height": ""
+                    },
+                    "type": "hidden",
+                    "input": true,
+                    "tableView": false,
+                    "placeholder": "",
+                    "prefix": "",
+                    "suffix": "",
+                    "multiple": false,
+                    "unique": false,
+                    "hidden": false,
+                    "clearOnHide": true,
+                    "refreshOn": "",
+                    "dataGridLabel": false,
+                    "labelPosition": "top",
+                    "description": "",
+                    "errorLabel": "",
+                    "tooltip": "",
+                    "hideLabel": false,
+                    "tabindex": "",
+                    "disabled": false,
+                    "autofocus": false,
+                    "widget": {
+                        "type": "input"
+                    },
+                    "validateOn": "change",
+                    "validate": {
+                        "required": false,
+                        "custom": "",
+                        "customPrivate": false,
+                        "strictDateValidation": false,
+                        "multiple": false,
+                        "unique": false
+                    },
+                    "conditional": {
+                        "show": null,
+                        "when": null,
+                        "eq": ""
+                    },
+                    "allowCalculateOverride": false,
+                    "showCharCount": false,
+                    "showWordCount": false,
+                    "allowMultipleMasks": false,
+                    "addons": [],
+                    "inputType": "hidden",
+                    "id": "ewsiqfd"
+                },
+                {
+                    "label": "nirStatus",
+                    "customClass": "",
+                    "modalEdit": false,
+                    "defaultValue": null,
+                    "persistent": true,
+                    "protected": false,
+                    "dbIndex": false,
+                    "encrypted": false,
+                    "redrawOn": "",
+                    "customDefaultValue": "",
+                    "calculateValue": "value = false;\nif (data.applicationStatus === 'Resubmit' || data.applicationStatus ===  'Resubmitted' )\n{\n\tif (data.nirBundleStatus === 'SIA Returned')\n\t\tvalue = false;\n\telse\n\t\tvalue = true;\n}",
+                    "calculateServer": false,
+                    "key": "nirStatus",
+                    "tags": [],
+                    "properties": {},
+                    "logic": [],
+                    "attributes": {},
+                    "overlay": {
+                        "style": "",
+                        "page": "",
+                        "left": "",
+                        "top": "",
+                        "width": "",
+                        "height": ""
+                    },
+                    "type": "hidden",
+                    "input": true,
+                    "tableView": false,
+                    "placeholder": "",
+                    "prefix": "",
+                    "suffix": "",
+                    "multiple": false,
+                    "unique": false,
+                    "hidden": false,
+                    "clearOnHide": true,
+                    "refreshOn": "",
+                    "dataGridLabel": false,
+                    "labelPosition": "top",
+                    "description": "",
+                    "errorLabel": "",
+                    "tooltip": "",
+                    "hideLabel": false,
+                    "tabindex": "",
+                    "disabled": false,
+                    "autofocus": false,
+                    "widget": {
+                        "type": "input"
+                    },
+                    "validateOn": "change",
+                    "validate": {
+                        "required": false,
+                        "custom": "",
+                        "customPrivate": false,
+                        "strictDateValidation": false,
+                        "multiple": false,
+                        "unique": false
+                    },
+                    "conditional": {
+                        "show": null,
+                        "when": null,
+                        "eq": ""
+                    },
+                    "allowCalculateOverride": false,
+                    "showCharCount": false,
+                    "showWordCount": false,
+                    "allowMultipleMasks": false,
+                    "addons": [],
+                    "inputType": "hidden",
+                    "id": "ec7z62g"
+                },
                 {
                     "title": "Application Documents",
                     "collapsible": false,
@@ -5294,7 +5436,7 @@
                             "attributes": {},
                             "components": [
                                 {
-                                    "id": "ele95t",
+                                    "id": "ele95t00000000000000",
                                     "key": "spropertyOwnerAndOrOperator",
                                     "tree": false,
                                     "type": "panel",
@@ -14830,7 +14972,7 @@
                             "attributes": {},
                             "components": [
                                 {
-                                    "id": "eks0gu",
+                                    "id": "eks0gu00000000000000",
                                     "key": "exposurePathwayQuestionnaireAffectedParcel",
                                     "tree": false,
                                     "type": "panel",
@@ -18774,7 +18916,7 @@
                                         }
                                     ],
                                     "collapsible": false,
-                                    "id": "eo5mwyp",
+                                    "id": "eo5mwyp00000000000000",
                                     "placeholder": "",
                                     "prefix": "",
                                     "customClass": "",
@@ -19949,148 +20091,6 @@
                     "inputType": "hidden",
                     "id": "e12wr4"
                 },
-                {
-                    "label": "nomStatus",
-                    "customClass": "",
-                    "modalEdit": false,
-                    "defaultValue": null,
-                    "persistent": true,
-                    "protected": false,
-                    "dbIndex": false,
-                    "encrypted": false,
-                    "redrawOn": "",
-                    "customDefaultValue": "",
-                    "calculateValue": "value = false;\r\nif (data.applicationStatus === 'Resubmit')\r\n{\r\n\tif (data.nomBundleStatus === 'SIA Returned')\r\n\t\tvalue = false;\r\n\telse\r\n\t\tvalue = true;\r\n}",
-                    "calculateServer": false,
-                    "key": "nomStatus",
-                    "tags": [],
-                    "properties": {},
-                    "logic": [],
-                    "attributes": {},
-                    "overlay": {
-                        "style": "",
-                        "page": "",
-                        "left": "",
-                        "top": "",
-                        "width": "",
-                        "height": ""
-                    },
-                    "type": "hidden",
-                    "input": true,
-                    "tableView": false,
-                    "placeholder": "",
-                    "prefix": "",
-                    "suffix": "",
-                    "multiple": false,
-                    "unique": false,
-                    "hidden": false,
-                    "clearOnHide": true,
-                    "refreshOn": "",
-                    "dataGridLabel": false,
-                    "labelPosition": "top",
-                    "description": "",
-                    "errorLabel": "",
-                    "tooltip": "",
-                    "hideLabel": false,
-                    "tabindex": "",
-                    "disabled": false,
-                    "autofocus": false,
-                    "widget": {
-                        "type": "input"
-                    },
-                    "validateOn": "change",
-                    "validate": {
-                        "required": false,
-                        "custom": "",
-                        "customPrivate": false,
-                        "strictDateValidation": false,
-                        "multiple": false,
-                        "unique": false
-                    },
-                    "conditional": {
-                        "show": null,
-                        "when": null,
-                        "eq": ""
-                    },
-                    "allowCalculateOverride": false,
-                    "showCharCount": false,
-                    "showWordCount": false,
-                    "allowMultipleMasks": false,
-                    "addons": [],
-                    "inputType": "hidden",
-                    "id": "ekg96n"
-                },
-                {
-                    "label": "nirStatus",
-                    "customClass": "",
-                    "modalEdit": false,
-                    "defaultValue": null,
-                    "persistent": true,
-                    "protected": false,
-                    "dbIndex": false,
-                    "encrypted": false,
-                    "redrawOn": "",
-                    "customDefaultValue": "",
-                    "calculateValue": "value = false;\r\nif (data.applicationStatus === 'Resubmit')\r\n{\r\n\tif (data.nirBundleStatus === 'SIA Returned')\r\n\t\tvalue = false;\r\n\telse\r\n\t\tvalue = true;\r\n}",
-                    "calculateServer": false,
-                    "key": "nirStatus",
-                    "tags": [],
-                    "properties": {},
-                    "logic": [],
-                    "attributes": {},
-                    "overlay": {
-                        "style": "",
-                        "page": "",
-                        "left": "",
-                        "top": "",
-                        "width": "",
-                        "height": ""
-                    },
-                    "type": "hidden",
-                    "input": true,
-                    "tableView": false,
-                    "placeholder": "",
-                    "prefix": "",
-                    "suffix": "",
-                    "multiple": false,
-                    "unique": false,
-                    "hidden": false,
-                    "clearOnHide": true,
-                    "refreshOn": "",
-                    "dataGridLabel": false,
-                    "labelPosition": "top",
-                    "description": "",
-                    "errorLabel": "",
-                    "tooltip": "",
-                    "hideLabel": false,
-                    "tabindex": "",
-                    "disabled": false,
-                    "autofocus": false,
-                    "widget": {
-                        "type": "input"
-                    },
-                    "validateOn": "change",
-                    "validate": {
-                        "required": false,
-                        "custom": "",
-                        "customPrivate": false,
-                        "strictDateValidation": false,
-                        "multiple": false,
-                        "unique": false
-                    },
-                    "conditional": {
-                        "show": null,
-                        "when": null,
-                        "eq": ""
-                    },
-                    "allowCalculateOverride": false,
-                    "showCharCount": false,
-                    "showWordCount": false,
-                    "allowMultipleMasks": false,
-                    "addons": [],
-                    "inputType": "hidden",
-                    "id": "e3scw5"
-                },
                 {
                     "label": "srcrBundleStatus",
                     "customClass": "",