diff --git a/backend/src/integration/resources/SHIBUI-1335-1.side b/backend/src/integration/resources/SHIBUI-1335-1.side
index 1af0bba89..f38eac2ce 100644
--- a/backend/src/integration/resources/SHIBUI-1335-1.side
+++ b/backend/src/integration/resources/SHIBUI-1335-1.side
@@ -117,6 +117,13 @@
         ["xpath=//li[2]/button", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "352f066f-c2af-4735-81b1-5440ba7a3432",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "id=/xmlId",
+      "targets": [],
+      "value": "10000"
     }, {
       "id": "e7462621-f4e4-4512-b200-20afa5685fc6",
       "comment": "",
@@ -1352,14 +1359,10 @@
     }, {
       "id": "c28d683a-552d-4752-aa89-465e33d60887",
       "comment": "",
-      "command": "waitForElementVisible",
-      "target": "css=tr:nth-child(2) > .td-lg:nth-child(4)",
-      "targets": [
-        ["css=tr:nth-child(2) > .td-lg:nth-child(4)", "css:finder"],
-        ["xpath=//tr[2]/td[4]", "xpath:position"],
-        ["xpath=//td[contains(.,'NameIDFormat')]", "xpath:innerText"]
-      ],
-      "value": "10000"
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "100902ee-6d6e-4148-a69b-b37746a4ad6e",
       "comment": "",
@@ -1381,6 +1384,13 @@
         ["xpath=//button[2]/i", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "febfcea8-8f72-4a17-b1a8-b1e323c8cced",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "c9d498da-9f59-40ae-b5d4-cae397a13766",
       "comment": "",
@@ -1402,6 +1412,13 @@
         ["xpath=//button[2]/i", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "4fdc2334-0b93-4f4c-b44e-80656f808f6d",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "441608df-24a3-4a60-bfce-50a90ff0ee16",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1335-2.side b/backend/src/integration/resources/SHIBUI-1335-2.side
index 3a1c51b24..88ef75013 100644
--- a/backend/src/integration/resources/SHIBUI-1335-2.side
+++ b/backend/src/integration/resources/SHIBUI-1335-2.side
@@ -691,10 +691,10 @@
     }, {
       "id": "eca1d3dd-9e47-49d2-b4a1-a45c2b6c8c3a",
       "comment": "",
-      "command": "waitForElementVisible",
-      "target": "css=tr:nth-child(1) > .td-lg:nth-child(4)",
+      "command": "pause",
+      "target": "2000",
       "targets": [],
-      "value": "10000"
+      "value": ""
     }, {
       "id": "d722902b-5c10-45dc-99df-d96f46e78313",
       "comment": "",
@@ -716,6 +716,13 @@
         ["xpath=//button[2]/i", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "d25400e1-127e-4b8c-b7e2-ade937cfd5a0",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "d7909094-96ce-4532-98b4-446cc013c9c8",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1335-3.side b/backend/src/integration/resources/SHIBUI-1335-3.side
index f85088621..865b8aa0e 100644
--- a/backend/src/integration/resources/SHIBUI-1335-3.side
+++ b/backend/src/integration/resources/SHIBUI-1335-3.side
@@ -785,10 +785,10 @@
     }, {
       "id": "455e24c1-5093-4da3-a62d-457bbf0cd5db",
       "comment": "",
-      "command": "waitForElementVisible",
-      "target": "css=tr:nth-child(2) > .td-lg:nth-child(4)",
+      "command": "pause",
+      "target": "2000",
       "targets": [],
-      "value": "10000"
+      "value": ""
     }, {
       "id": "9f7e95cf-4dd5-415f-8577-a6f1bc54a85d",
       "comment": "",
@@ -810,6 +810,13 @@
         ["xpath=//td[contains(.,'NameIDFormat')]", "xpath:innerText"]
       ],
       "value": "NameIDFormat"
+    }, {
+      "id": "81970d9d-2892-4b42-ba56-ba1a14f453d2",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "63ac7307-0538-4c0d-8e98-2f05c767baaf",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1335-4.side b/backend/src/integration/resources/SHIBUI-1335-4.side
index 8ffe35e98..e20483cf2 100644
--- a/backend/src/integration/resources/SHIBUI-1335-4.side
+++ b/backend/src/integration/resources/SHIBUI-1335-4.side
@@ -914,7 +914,7 @@
       "id": "77dfeb05-38e3-4ef8-9566-06e7597d464c",
       "comment": "",
       "command": "click",
-      "target": "css=.btn-primary > translate-i18n",
+      "target": "css=.btn-primary",
       "targets": [
         ["css=.btn-primary > translate-i18n", "css:finder"],
         ["xpath=//div/button/translate-i18n", "xpath:position"],
@@ -924,10 +924,10 @@
     }, {
       "id": "f79371b5-0081-45a0-bfb3-c403db903043",
       "comment": "",
-      "command": "waitForElementVisible",
-      "target": "css=tr:nth-child(1) > .td-lg:nth-child(4)",
+      "command": "pause",
+      "target": "2000",
       "targets": [],
-      "value": "10000"
+      "value": ""
     }, {
       "id": "a8ed628c-53f7-4551-9ce8-fef976cc96ce",
       "comment": "",
@@ -938,6 +938,13 @@
         ["xpath=//button[2]/i", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "6b3ec8f1-8b9a-40f5-816f-3a1e415b9d8d",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "be805934-2692-4a1c-a28f-afb3cc4eb5f4",
       "comment": "",
@@ -959,6 +966,13 @@
         ["xpath=//button[2]/i", "xpath:position"]
       ],
       "value": ""
+    }, {
+      "id": "403570ff-e1f0-4db9-925f-f90c5994b60e",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "8f2da627-e8ad-473a-a71a-bec5dd1f0999",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1392.side b/backend/src/integration/resources/SHIBUI-1392.side
index 8a2bf4d1b..a0a5b5b55 100644
--- a/backend/src/integration/resources/SHIBUI-1392.side
+++ b/backend/src/integration/resources/SHIBUI-1392.side
@@ -349,6 +349,13 @@
         ["xpath=//a[contains(.,'Script')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "786cd3cb-46b2-4361-b449-8f679ff97135",
+      "comment": "",
+      "command": "waitForElementPresent",
+      "target": "id=/nameIdFormatFilterTarget.target",
+      "targets": [],
+      "value": "10000"
     }, {
       "id": "dcf31546-0976-44ae-9ffc-c29a5255d646",
       "comment": "",
@@ -366,13 +373,7 @@
       "comment": "",
       "command": "editContent",
       "target": "id=/nameIdFormatFilterTarget.target",
-      "targets": [
-        ["id=/nameIdFormatFilterTarget.target", "id"],
-        ["css=#\\/nameIdFormatFilterTarget\\.target", "css:finder"],
-        ["xpath=//p[@id='/nameIdFormatFilterTarget.target']", "xpath:attributes"],
-        ["xpath=//p", "xpath:position"],
-        ["xpath=//p[contains(.,'eval(true)')]", "xpath:innerText"]
-      ],
+      "targets": [],
       "value": "eval(true)"
     }, {
       "id": "05870356-d3db-4540-bb3f-db34b1cf65f1",
@@ -380,9 +381,19 @@
       "command": "sendKeys",
       "target": "id=/nameIdFormatFilterTarget.target",
       "targets": [],
-      "value": ";"
+      "value": "${KEY_END};"
     }, {
-      "id": "b544a0b1-fc04-4dc3-8a11-5769500e5503",
+      "id": "d7721254-68c9-4140-af2a-1757cce99da7",
+      "comment": "",
+      "command": "click",
+      "target": "css=.section-body",
+      "targets": [
+        ["css=.section-body", "css:finder"],
+        ["xpath=//section/div[2]", "xpath:position"]
+      ],
+      "value": ""
+    }, {
+      "id": "ed6eb266-04f0-4517-b874-ea1d0ba68441",
       "comment": "",
       "command": "click",
       "target": "css=#\\/filterEnabled\\.parent > .custom-control-label",
@@ -436,7 +447,7 @@
     }, {
       "id": "ad613704-0718-4b83-97f1-b49897f510eb",
       "comment": "",
-      "command": "waitForElementEditable",
+      "command": "waitForElementVisible",
       "target": "id=/nameIdFormatFilterTarget.target",
       "targets": [],
       "value": "10000"
@@ -452,7 +463,7 @@
         ["xpath=//p", "xpath:position"],
         ["xpath=//p[contains(.,'eval(true)')]", "xpath:innerText"]
       ],
-      "value": "eval(true)"
+      "value": "eval(true);"
     }]
   }],
   "suites": [{