diff --git a/backend/src/integration/resources/SHIBUI-1744-2.side b/backend/src/integration/resources/SHIBUI-1744-2.side
index 36ec5d6ee..2bc9dc4e1 100644
--- a/backend/src/integration/resources/SHIBUI-1744-2.side
+++ b/backend/src/integration/resources/SHIBUI-1744-2.side
@@ -367,14 +367,14 @@
       "id": "c82be982-6551-4d50-af85-b9e87610e000",
       "comment": "",
       "command": "waitForElementVisible",
-      "target": "css=fieldset > ul > li > strong",
+      "target": "css=fieldset > div > button > strong",
       "targets": [],
       "value": "Bundle - Test Bundle"
     }, {
       "id": "e3b80e89-4278-4e2e-9aa4-d2cc03e86932",
       "comment": "",
       "command": "assertText",
-      "target": "css=fieldset > ul > li > strong",
+      "target": "css=fieldset > div > button > strong",
       "targets": [
         ["css=strong", "css:finder"],
         ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[10]/div/div/fieldset/ul/li/strong", "xpath:idRelative"],
@@ -386,9 +386,12 @@
       "id": "421fdaa5-e42b-4ba3-be22-c5697624ee34",
       "comment": "",
       "command": "click",
-      "target": "css=.fa-check:nth-child(2)",
+      "target": "css=fieldset > div > button",
       "targets": [
-        ["css=.fa-check:nth-child(2)", "css:finder"]
+        ["css=.badge-light", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[10]/div/div/fieldset/div/button/span", "xpath:idRelative"],
+        ["xpath=//div/button/span", "xpath:position"],
+        ["xpath=//span[contains(.,'Select Bundle')]", "xpath:innerText"]
       ],
       "value": ""
     }, {
diff --git a/backend/src/integration/resources/SHIBUI-1744-3.side b/backend/src/integration/resources/SHIBUI-1744-3.side
index bbdbf1a84..96d28a5c4 100644
--- a/backend/src/integration/resources/SHIBUI-1744-3.side
+++ b/backend/src/integration/resources/SHIBUI-1744-3.side
@@ -454,14 +454,14 @@
       "id": "e8a2f501-0efa-43a3-bbf2-b86e5ec8f6d1",
       "comment": "",
       "command": "waitForElementVisible",
-      "target": "css=fieldset > ul > li > strong",
+      "target": "css=fieldset > div > button > strong",
       "targets": [],
       "value": "30000"
     }, {
       "id": "cc36c580-3d53-483a-a813-2a6c8fb95792",
       "comment": "",
       "command": "assertText",
-      "target": "css=fieldset > ul > li > strong",
+      "target": "css=fieldset > div > button > strong",
       "targets": [
         ["css=strong", "css:finder"],
         ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[8]/div/div/div/fieldset/ul/li/strong", "xpath:idRelative"],
@@ -473,7 +473,7 @@
       "id": "caabc3c1-7ac7-4251-9885-fe2e3b7c4c10",
       "comment": "",
       "command": "click",
-      "target": "css=fieldset > ul > li > button",
+      "target": "css=fieldset > div > button",
       "targets": [
         ["css=.fa-check:nth-child(2) > path", "css:finder"]
       ],
@@ -623,11 +623,18 @@
         ["xpath=//button[contains(.,' Save')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "e54aff89-0f95-452f-92c0-42ca78188fc0",
+      "comment": "",
+      "command": "waitForElementVisible",
+      "target": "css=#filters > ul > li > div > button",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "d6a2d477-4b89-4cf5-a4a8-0f35afcdd5f8",
       "comment": "",
       "command": "click",
-      "target": "css=.mx-4",
+      "target": "css=#filters > ul > li > div > button",
       "targets": [
         ["css=.mx-4", "css:finder"],
         ["xpath=(//button[@type='button'])[13]", "xpath:attributes"],