diff --git a/forms-flow-ai/epd-forms/bundling/Contaminated Sites Services Application Form.json b/forms-flow-ai/epd-forms/bundling/Contaminated Sites Services Application Form.json
index ab8956d9..49e37a23 100644
--- a/forms-flow-ai/epd-forms/bundling/Contaminated Sites Services Application Form.json	
+++ b/forms-flow-ai/epd-forms/bundling/Contaminated Sites Services Application Form.json	
@@ -7662,7 +7662,7 @@
                                     "addons": [],
                                     "tree": false,
                                     "lazyLoad": false,
-                                    "id": "ehmz9lv0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+                                    "id": "ehmz9lv000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
                                 }
                             ],
                             "placeholder": "",
@@ -9305,7 +9305,7 @@
                                         }
                                     ],
                                     "collapsible": false,
-                                    "id": "ewhx8sm0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                    "id": "ewhx8sm000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                     "placeholder": "",
                                     "prefix": "",
                                     "customClass": "",
@@ -18464,7 +18464,7 @@
                                             },
                                             "inputMask": "999-999-999",
                                             "tableView": true,
-                                            "id": "elva880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                            "id": "elva88000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                             "placeholder": "",
                                             "prefix": "",
                                             "customClass": "",
@@ -18544,7 +18544,7 @@
                                             "tableView": true,
                                             "autoExpand": true,
                                             "inputFormat": "plain",
-                                            "id": "ey48nu0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                            "id": "ey48nu000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                             "placeholder": "",
                                             "prefix": "",
                                             "customClass": "",
@@ -18919,7 +18919,7 @@
                                                     "input": true,
                                                     "label": "PIN",
                                                     "tableView": true,
-                                                    "id": "eyxe45n0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                                    "id": "eyxe45n000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                                     "placeholder": "",
                                                     "prefix": "",
                                                     "customClass": "",
@@ -19012,7 +19012,7 @@
                                                     "autoExpand": true,
                                                     "inputFormat": "plain",
                                                     "placeholder": "example, metes and bounds",
-                                                    "id": "efdcvf0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                                    "id": "efdcvf000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                                     "prefix": "",
                                                     "customClass": "",
                                                     "suffix": "",
@@ -19226,7 +19226,7 @@
                                                     "input": true,
                                                     "label": "Crown Land File Numbers",
                                                     "tableView": true,
-                                                    "id": "emf4u7g0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                                    "id": "emf4u7g000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                                     "placeholder": "",
                                                     "prefix": "",
                                                     "customClass": "",
@@ -20278,7 +20278,7 @@
                                                     },
                                                     "inputMask": "999-999-999",
                                                     "tableView": true,
-                                                    "id": "ev43oe90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                                    "id": "ev43oe9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                                     "placeholder": "",
                                                     "prefix": "",
                                                     "customClass": "",
@@ -20358,7 +20358,7 @@
                                                     "tableView": true,
                                                     "autoExpand": true,
                                                     "inputFormat": "plain",
-                                                    "id": "eb3d0l0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                                    "id": "eb3d0l000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                                     "placeholder": "",
                                                     "prefix": "",
                                                     "customClass": "",
@@ -20733,7 +20733,7 @@
                                                             "input": true,
                                                             "label": "PIN",
                                                             "tableView": true,
-                                                            "id": "eyv4fcu0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                                            "id": "eyv4fcu000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                                             "placeholder": "",
                                                             "prefix": "",
                                                             "customClass": "",
@@ -20826,7 +20826,7 @@
                                                             "autoExpand": true,
                                                             "inputFormat": "plain",
                                                             "placeholder": "example, metes and bounds",
-                                                            "id": "ecgeub0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                                            "id": "ecgeub000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                                             "prefix": "",
                                                             "customClass": "",
                                                             "suffix": "",
@@ -21040,7 +21040,7 @@
                                                             "input": true,
                                                             "label": "Crown Land File Numbers",
                                                             "tableView": true,
-                                                            "id": "eguyyh0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                                                            "id": "eguyyh000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
                                                             "placeholder": "",
                                                             "prefix": "",
                                                             "customClass": "",
@@ -23142,71 +23142,80 @@
                     "components": [
                         {
                             "label": "I, the undersigned, confirm that the above information is true based on my knowledge as of the date this application form was completed. I understand that fees for contaminated sites services will be collected and/or invoiced as per Schedule 3 of the Contaminated Sites Regulation. I understand the billing contact on this form will be the person with whom the ministry communicates about fees for contaminated sites services.",
-                            "tableView": false,
-                            "defaultValue": false,
-                            "key": "checkbox",
-                            "type": "checkbox",
-                            "input": true,
-                            "placeholder": "",
-                            "prefix": "",
-                            "customClass": "",
-                            "suffix": "",
-                            "multiple": false,
-                            "protected": false,
-                            "unique": false,
-                            "persistent": true,
-                            "hidden": false,
-                            "clearOnHide": true,
-                            "refreshOn": "",
-                            "redrawOn": "",
-                            "modalEdit": false,
-                            "dataGridLabel": true,
-                            "labelPosition": "right",
                             "description": "",
-                            "errorLabel": "",
                             "tooltip": "",
-                            "hideLabel": false,
+                            "shortcut": "",
+                            "inputType": "checkbox",
+                            "customClass": "",
                             "tabindex": "",
-                            "disabled": false,
+                            "hidden": false,
+                            "hideLabel": false,
                             "autofocus": false,
+                            "disabled": false,
+                            "tableView": false,
+                            "modalEdit": false,
+                            "defaultValue": false,
+                            "persistent": true,
+                            "protected": false,
                             "dbIndex": false,
+                            "encrypted": false,
+                            "redrawOn": "",
+                            "clearOnHide": true,
                             "customDefaultValue": "",
                             "calculateValue": "",
                             "calculateServer": false,
-                            "widget": null,
-                            "attributes": {},
-                            "validateOn": "change",
+                            "allowCalculateOverride": false,
                             "validate": {
-                                "required": false,
+                                "required": true,
+                                "customMessage": "",
                                 "custom": "",
                                 "customPrivate": false,
+                                "json": "",
                                 "strictDateValidation": false,
                                 "multiple": false,
                                 "unique": false
                             },
+                            "errorLabel": "",
+                            "errors": "",
+                            "key": "checkbox",
+                            "tags": [],
+                            "properties": {},
                             "conditional": {
                                 "show": null,
                                 "when": null,
-                                "eq": ""
+                                "eq": "",
+                                "json": ""
                             },
+                            "customConditional": "",
+                            "logic": [],
+                            "attributes": {},
                             "overlay": {
                                 "style": "",
+                                "page": "",
                                 "left": "",
                                 "top": "",
                                 "width": "",
                                 "height": ""
                             },
-                            "allowCalculateOverride": false,
-                            "encrypted": false,
+                            "type": "checkbox",
+                            "name": "",
+                            "value": "",
+                            "input": true,
+                            "placeholder": "",
+                            "prefix": "",
+                            "suffix": "",
+                            "multiple": false,
+                            "unique": false,
+                            "refreshOn": "",
+                            "dataGridLabel": true,
+                            "labelPosition": "right",
+                            "widget": null,
+                            "validateOn": "change",
                             "showCharCount": false,
                             "showWordCount": false,
-                            "properties": {},
                             "allowMultipleMasks": false,
                             "addons": [],
-                            "inputType": "checkbox",
-                            "value": "",
-                            "name": "",
-                            "id": "euy9jb5"
+                            "id": "etbbvsi"
                         },
                         {
                             "label": "By checking this box, I authorize the collection and submission of my information to the Ministry by a consultant on my behalf.",