diff --git a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
index ec9344520..f9e12afe7 100644
--- a/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
+++ b/backend/src/integration/groovy/edu/internet2/tier/shibboleth/admin/ui/SeleniumSIDETest.groovy
@@ -129,4 +129,3 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-1503: User can be enabled'                                | '/SHIBUI-1503-3.side'
     }
 }
-
diff --git a/backend/src/integration/resources/SHIBUI-1281.side b/backend/src/integration/resources/SHIBUI-1281.side
index 9b715c3f0..52695c6bc 100644
--- a/backend/src/integration/resources/SHIBUI-1281.side
+++ b/backend/src/integration/resources/SHIBUI-1281.side
@@ -778,10 +778,10 @@
     }, {
       "id": "3cfbc4e0-f120-43ca-8a59-8727f91b5a1c",
       "comment": "",
-      "command": "sendKeys",
-      "target": "css=div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "command": "click",
+      "target": "css=body",
       "targets": [],
-      "value": "${KEY_ENTER}"
+      "value": ""
     }, {
       "id": "4f61120b-7c6b-4f8e-8543-898298451a56",
       "comment": "",
@@ -1388,7 +1388,7 @@
       "id": "ba74d18d-0996-485f-8a9f-01a39428eb0c",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=.row:nth-child(8) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[13]", "xpath:attributes"],
@@ -1443,7 +1443,7 @@
       "id": "ec3afb37-30b4-4d07-93a6-dcf022605532",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=div:nth-child(8) .d-flex > .btn", "css:finder"],
         ["xpath=//div/button", "xpath:position"],
@@ -1496,7 +1496,7 @@
       "id": "8b340d1f-4944-4d10-a4cd-5e79be6804ef",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=div:nth-child(8) .d-flex > .btn", "css:finder"],
         ["xpath=//div/button", "xpath:position"],
@@ -1549,7 +1549,7 @@
       "id": "d6e7a640-a578-415b-9c1b-b2313b62ad46",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=div:nth-child(8) .d-flex > .btn", "css:finder"],
         ["xpath=//div/button", "xpath:position"],
@@ -1602,7 +1602,7 @@
       "id": "4c15be93-75be-4673-b703-07a705300d0f",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=div:nth-child(8) .btn > translate-i18n", "css:finder"],
         ["xpath=//div/button/translate-i18n", "xpath:position"]
@@ -1612,11 +1612,11 @@
       "id": "1a1b509e-1768-4291-820d-26f4b73a9d71",
       "comment": "",
       "command": "click",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(8) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[2]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["css=.focus", "css:finder"],
-        ["xpath=(//input[@value=''])[7]", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[8]/div/div/div/div/div/div[2]/div[5]/div/div/div/div/div/div/div/input", "xpath:idRelative"],
+        ["xpath=(//input[@value=''])[5]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[2]/div/div/div/div/div/div[2]/div[5]/div/div/div/div/div/div/div/input", "xpath:idRelative"],
         ["xpath=//div[5]/div/div/div/div/div/div/div/input", "xpath:position"]
       ],
       "value": ""
@@ -1624,7 +1624,7 @@
       "id": "433d6e9d-9d03-4042-9ee0-6284570f8a3c",
       "comment": "",
       "command": "type",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(8) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[2]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["id=field83", "id"],
         ["css=#field83", "css:finder"],
@@ -1636,15 +1636,15 @@
     }, {
       "id": "b505f2f8-396a-47b3-adb9-c3edb083cafb",
       "comment": "",
-      "command": "sendKeys",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(8) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "command": "click",
+      "target": "css=body",
       "targets": [],
-      "value": "${KEY_ENTER}"
+      "value": ""
     }, {
       "id": "c8bb3bee-3d61-4324-a3aa-38b78232b969",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=.row:nth-child(9) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[25]", "xpath:attributes"],
@@ -1663,12 +1663,12 @@
       "id": "cbf15c4c-35d9-4f80-ba3d-bfe960048cd1",
       "comment": "",
       "command": "click",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > button",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div/div/div[1]/div/div[1]/div/div/button",
       "targets": [
         ["css=.is-invalid > .toggle-button", "css:finder"],
-        ["xpath=(//button[@type='button'])[27]", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[9]/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/button", "xpath:idRelative"],
-        ["xpath=//div[9]/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/button", "xpath:position"]
+        ["xpath=(//button[@type='button'])[22]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div/div/form/div/div/div/div/div[9]/div/div/div/div[4]/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//div[4]/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/button", "xpath:position"]
       ],
       "value": ""
     }, {
@@ -1698,7 +1698,7 @@
       "id": "ed769470-9c3f-4c23-bbed-85513dcea800",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=div:nth-child(9) .d-flex > .btn", "css:finder"],
         ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button", "xpath:position"]
@@ -1715,7 +1715,7 @@
       "id": "2b063eb8-f2d6-4a59-85bb-b04c467d9874",
       "comment": "",
       "command": "click",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(2) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > button",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[2]/div/div[1]/div/div[1]/div/div/button",
       "targets": [
         ["css=.is-invalid > .toggle-button", "css:finder"],
         ["xpath=(//button[@type='button'])[29]", "xpath:attributes"],
@@ -1750,7 +1750,7 @@
       "id": "892ddc96-970b-4dde-9189-0dc9ed197dab",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=div:nth-child(9) .d-flex > .btn", "css:finder"],
         ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button", "xpath:position"]
@@ -1767,7 +1767,7 @@
       "id": "64e215d9-6e46-422f-882c-13b6fb102622",
       "comment": "",
       "command": "click",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(3) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > button",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[3]/div/div[1]/div/div[1]/div/div/button",
       "targets": [
         ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/2-container .btn", "css:finder"],
         ["xpath=(//button[@type='button'])[9]", "xpath:attributes"],
@@ -1802,7 +1802,7 @@
       "id": "f0dd4b79-eab5-4d4b-af2e-07ca661f8288",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=div:nth-child(9) .btn > translate-i18n", "css:finder"],
         ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button/translate-i18n", "xpath:position"]
@@ -1812,7 +1812,7 @@
       "id": "dacd34b0-9e48-4838-b137-bf22dd027ed0",
       "comment": "",
       "command": "click",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(4) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[4]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["css=.focus", "css:finder"],
         ["xpath=(//input[@value=''])[10]", "xpath:attributes"],
@@ -1824,7 +1824,7 @@
       "id": "cc9dd18b-ee87-4aa7-91f2-59f02834759b",
       "comment": "",
       "command": "type",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(4) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[4]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["id=field87", "id"],
         ["css=#field87", "css:finder"],
@@ -1836,10 +1836,10 @@
     }, {
       "id": "5b836abc-eb72-417f-acdc-8b3ec267cd96",
       "comment": "",
-      "command": "sendKeys",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(4) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "command": "click",
+      "target": "css=body",
       "targets": [],
-      "value": "${KEY_ENTER}"
+      "value": ""
     }, {
       "id": "7c85fe59-dc95-4328-a010-33d1a06a5ce5",
       "comment": "",
@@ -1923,11 +1923,11 @@
       "id": "e53030b6-f344-4361-981d-b8303a721c5d",
       "comment": "",
       "command": "assertText",
-      "target": "css=.d-flex:nth-child(8) .d-flex:nth-child(5) > .d-block",
+      "target": "css=.mb-4:nth-child(8) .d-flex:nth-child(5) > .d-block",
       "targets": [
-        ["css=.d-flex:nth-child(8) .d-flex:nth-child(5) > .d-block", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[8]/ul/li[5]/span", "xpath:idRelative"],
-        ["xpath=//div[8]/ul/li[5]/span", "xpath:position"]
+        ["css=.mb-4:nth-child(8) .d-flex:nth-child(5) > .d-block", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[2]/ul/li[5]/span", "xpath:idRelative"],
+        ["xpath=//section[8]/div/div[2]/div[2]/div/div[2]/ul/li[5]/span", "xpath:position"]
       ],
       "value": "somethingElse"
     }, {
diff --git a/backend/src/integration/resources/SHIBUI-1333.side b/backend/src/integration/resources/SHIBUI-1333.side
index 64d9ae077..ba8dab567 100644
--- a/backend/src/integration/resources/SHIBUI-1333.side
+++ b/backend/src/integration/resources/SHIBUI-1333.side
@@ -711,10 +711,10 @@
       ],
       "value": ""
     }, {
-      "id": "104367d3-f250-4439-8721-32dcf9f25e0c",
+      "id": "46495c5c-43ff-438a-814e-dbfc0b8da51e",
       "comment": "",
       "command": "click",
-      "target": "css=.btn-success",
+      "target": "css=.array-add-button",
       "targets": [
         ["css=.btn-success", "css:finder"],
         ["xpath=//div/button", "xpath:position"],
@@ -778,7 +778,7 @@
       "id": "23fd8856-32df-48ed-a198-a74e8ca71b10",
       "comment": "",
       "command": "type",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(5) > div > div:nth-child(1) > div > div:nth-child(2) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[5]/div/div[1]/div/div[2]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["css=.focus", "css:finder"],
         ["xpath=(//input[@value=''])[9]", "xpath:attributes"],
@@ -789,10 +789,19 @@
     }, {
       "id": "6f0363e3-cd0b-45cc-8210-7cad7c29997e",
       "comment": "",
-      "command": "sendKeys",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(5) > div > div:nth-child(1) > div > div:nth-child(2) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
-      "targets": [],
-      "value": "${KEY_ENTER}"
+      "command": "click",
+      "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4",
+      "targets": [
+        ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "id"],
+        ["linkText=somethingElse", "linkText"],
+        ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "css:finder"],
+        ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4']", "xpath:attributes"],
+        ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4']/a[5]", "xpath:idRelative"],
+        ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"],
+        ["xpath=//a[5]", "xpath:position"],
+        ["xpath=//a[contains(.,'somethingElse')]", "xpath:innerText"]
+      ],
+      "value": ""
     }, {
       "id": "4f61120b-7c6b-4f8e-8543-898298451a56",
       "comment": "",
@@ -1378,7 +1387,7 @@
       "id": "ba74d18d-0996-485f-8a9f-01a39428eb0c",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=.row:nth-child(8) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[13]", "xpath:attributes"],
@@ -1433,7 +1442,7 @@
       "id": "ec3afb37-30b4-4d07-93a6-dcf022605532",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=div:nth-child(8) .d-flex > .btn", "css:finder"],
         ["xpath=//div/button", "xpath:position"],
@@ -1486,7 +1495,7 @@
       "id": "8b340d1f-4944-4d10-a4cd-5e79be6804ef",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=div:nth-child(8) .d-flex > .btn", "css:finder"],
         ["xpath=//div/button", "xpath:position"],
@@ -1539,7 +1548,7 @@
       "id": "d6e7a640-a578-415b-9c1b-b2313b62ad46",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=div:nth-child(8) .d-flex > .btn", "css:finder"],
         ["xpath=//div/button", "xpath:position"],
@@ -1592,7 +1601,7 @@
       "id": "4c15be93-75be-4673-b703-07a705300d0f",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=div:nth-child(8) .btn > translate-i18n", "css:finder"],
         ["xpath=//div/button/translate-i18n", "xpath:position"]
@@ -1602,7 +1611,7 @@
       "id": "1a1b509e-1768-4291-820d-26f4b73a9d71",
       "comment": "",
       "command": "click",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(8) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[2]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div/input[1]",
       "targets": [
         ["css=.focus", "css:finder"],
         ["xpath=(//input[@value=''])[10]", "xpath:attributes"],
@@ -1614,7 +1623,7 @@
       "id": "433d6e9d-9d03-4042-9ee0-6284570f8a3c",
       "comment": "",
       "command": "type",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(8) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[2]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div/input[1]",
       "targets": [
         ["id=field83", "id"],
         ["css=#field83", "css:finder"],
@@ -1626,15 +1635,24 @@
     }, {
       "id": "3a2e2040-7443-4e3a-99b1-363f87580cba",
       "comment": "",
-      "command": "sendKeys",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(8) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
-      "targets": [],
-      "value": "${KEY_ENTER}"
+      "command": "click",
+      "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4",
+      "targets": [
+        ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", "id"],
+        ["linkText=somethingElse", "linkText"],
+        ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", "css:finder"],
+        ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4']", "xpath:attributes"],
+        ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_4']/a[5]", "xpath:idRelative"],
+        ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"],
+        ["xpath=//a[5]", "xpath:position"],
+        ["xpath=//a[contains(.,'somethingElse')]", "xpath:innerText"]
+      ],
+      "value": ""
     }, {
       "id": "c8bb3bee-3d61-4324-a3aa-38b78232b969",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=.row:nth-child(9) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[25]", "xpath:attributes"],
@@ -1653,7 +1671,7 @@
       "id": "cbf15c4c-35d9-4f80-ba3d-bfe960048cd1",
       "comment": "",
       "command": "click",
-      "target": "css=div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > button",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div/div/div[1]/div/div[1]/div/div/button",
       "targets": [
         ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/0-container .btn", "css:finder"],
         ["xpath=(//button[@type='button'])[7]", "xpath:attributes"],
@@ -1688,7 +1706,7 @@
       "id": "ed769470-9c3f-4c23-bbed-85513dcea800",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=div:nth-child(9) .d-flex > .btn", "css:finder"],
         ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button", "xpath:position"]
@@ -1705,7 +1723,7 @@
       "id": "2b063eb8-f2d6-4a59-85bb-b04c467d9874",
       "comment": "",
       "command": "click",
-      "target": "css=div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(2) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > button",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[2]/div/div[1]/div/div[1]/div/div/button",
       "targets": [
         ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/1-container .btn", "css:finder"],
         ["xpath=(//button[@type='button'])[8]", "xpath:attributes"],
@@ -1740,7 +1758,7 @@
       "id": "892ddc96-970b-4dde-9189-0dc9ed197dab",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=div:nth-child(9) .d-flex > .btn", "css:finder"],
         ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button", "xpath:position"]
@@ -1757,7 +1775,7 @@
       "id": "64e215d9-6e46-422f-882c-13b6fb102622",
       "comment": "",
       "command": "click",
-      "target": "css=div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(3) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > button",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[3]/div/div[1]/div/div[1]/div/div/button",
       "targets": [
         ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/2-container .btn", "css:finder"],
         ["xpath=(//button[@type='button'])[9]", "xpath:attributes"],
@@ -1792,7 +1810,7 @@
       "id": "f0dd4b79-eab5-4d4b-af2e-07ca661f8288",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=div:nth-child(9) .btn > translate-i18n", "css:finder"],
         ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button/translate-i18n", "xpath:position"]
@@ -1802,7 +1820,7 @@
       "id": "dacd34b0-9e48-4838-b137-bf22dd027ed0",
       "comment": "",
       "command": "click",
-      "target": "css=div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(4) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[4]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["css=.focus", "css:finder"],
         ["xpath=(//input[@value=''])[12]", "xpath:attributes"],
@@ -1814,7 +1832,7 @@
       "id": "cc9dd18b-ee87-4aa7-91f2-59f02834759b",
       "comment": "",
       "command": "type",
-      "target": "css=div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(4) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[4]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["id=field87", "id"],
         ["css=#field87", "css:finder"],
@@ -1826,10 +1844,19 @@
     }, {
       "id": "1f62c43d-e605-4d62-9ce4-51f950788ac4",
       "comment": "",
-      "command": "sendKeys",
-      "target": "css=div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(4) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
-      "targets": [],
-      "value": "${KEY_ENTER}"
+      "command": "click",
+      "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3",
+      "targets": [
+        ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", "id"],
+        ["linkText=otherThings", "linkText"],
+        ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", "css:finder"],
+        ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3']", "xpath:attributes"],
+        ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_3']/a[4]", "xpath:idRelative"],
+        ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"],
+        ["xpath=//a[4]", "xpath:position"],
+        ["xpath=//a[contains(.,'otherThings')]", "xpath:innerText"]
+      ],
+      "value": ""
     }, {
       "id": "7c85fe59-dc95-4328-a010-33d1a06a5ce5",
       "comment": "",
@@ -1913,11 +1940,12 @@
       "id": "e53030b6-f344-4361-981d-b8303a721c5d",
       "comment": "",
       "command": "assertText",
-      "target": "css=.d-flex:nth-child(8) .d-flex:nth-child(5)",
+      "target": "css=.mb-4:nth-child(4) .d-flex:nth-child(5) > .d-block",
       "targets": [
-        ["css=.d-flex:nth-child(8) .d-flex:nth-child(5)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[8]/ul/li[5]", "xpath:idRelative"],
-        ["xpath=//div[8]/ul/li[5]", "xpath:position"]
+        ["css=.mb-4:nth-child(4) .d-flex:nth-child(5) > .d-block", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[4]/div/div[2]/div[2]/div/div[2]/ul/li[5]/span", "xpath:idRelative"],
+        ["xpath=//li[5]/span", "xpath:position"],
+        ["xpath=//span[contains(.,'somethingElse')]", "xpath:innerText"]
       ],
       "value": "somethingElse"
     }, {
@@ -2209,11 +2237,11 @@
       "id": "951a21c9-4cd3-4989-8dc0-77760ca0dc95",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)",
+      "target": "css=.mb-4:nth-child(9) div:nth-child(3) .d-block:nth-child(2)",
       "targets": [
-        ["css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"],
+        ["css=.mb-4:nth-child(9) div:nth-child(3) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[3]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//section[7]/div/div[2]/div[2]/div/div[3]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'responder-id-123')]", "xpath:innerText"]
       ],
       "value": "responder-id-123"
diff --git a/backend/src/integration/resources/SHIBUI-1334-1.side b/backend/src/integration/resources/SHIBUI-1334-1.side
index 59c07f5d1..9476b6d3f 100644
--- a/backend/src/integration/resources/SHIBUI-1334-1.side
+++ b/backend/src/integration/resources/SHIBUI-1334-1.side
@@ -779,7 +779,7 @@
       "id": "23fd8856-32df-48ed-a198-a74e8ca71b10",
       "comment": "",
       "command": "type",
-      "target": "css=section > div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(5) > div > div:nth-child(1) > div > div:nth-child(2) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[5]/div/div[1]/div/div[2]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["css=.focus", "css:finder"],
         ["xpath=(//input[@value=''])[3]", "xpath:attributes"],
@@ -790,10 +790,19 @@
     }, {
       "id": "c11bf56d-4516-4397-9a19-e07cc12eda2a",
       "comment": "",
-      "command": "sendKeys",
-      "target": "css=section > div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(5) > div > div:nth-child(1) > div > div:nth-child(2) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
-      "targets": [],
-      "value": "${KEY_ENTER}"
+      "command": "click",
+      "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4",
+      "targets": [
+        ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "id"],
+        ["linkText=somethingElse", "linkText"],
+        ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "css:finder"],
+        ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4']", "xpath:attributes"],
+        ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4']/a[5]", "xpath:idRelative"],
+        ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"],
+        ["xpath=//a[5]", "xpath:position"],
+        ["xpath=//a[contains(.,'somethingElse')]", "xpath:innerText"]
+      ],
+      "value": ""
     }, {
       "id": "4f61120b-7c6b-4f8e-8543-898298451a56",
       "comment": "",
@@ -1384,7 +1393,7 @@
       "id": "ba74d18d-0996-485f-8a9f-01a39428eb0c",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=.row:nth-child(8) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[13]", "xpath:attributes"],
@@ -1439,7 +1448,7 @@
       "id": "ec3afb37-30b4-4d07-93a6-dcf022605532",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=div:nth-child(8) .d-flex > .btn", "css:finder"],
         ["xpath=//div/button", "xpath:position"],
@@ -1492,7 +1501,7 @@
       "id": "8b340d1f-4944-4d10-a4cd-5e79be6804ef",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=div:nth-child(8) .d-flex > .btn", "css:finder"],
         ["xpath=//div/button", "xpath:position"],
@@ -1545,7 +1554,7 @@
       "id": "d6e7a640-a578-415b-9c1b-b2313b62ad46",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=div:nth-child(8) .d-flex > .btn", "css:finder"],
         ["xpath=//div/button", "xpath:position"],
@@ -1598,7 +1607,7 @@
       "id": "4c15be93-75be-4673-b703-07a705300d0f",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=div:nth-child(8) .btn > translate-i18n", "css:finder"],
         ["xpath=//div/button/translate-i18n", "xpath:position"]
@@ -1608,7 +1617,7 @@
       "id": "1a1b509e-1768-4291-820d-26f4b73a9d71",
       "comment": "",
       "command": "click",
-      "target": "css=section > div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(8) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[2]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["id=/relyingPartyOverrides/nameIdFormats/4", "id"],
         ["css=#\\/relyingPartyOverrides\\/nameIdFormats\\/4", "css:finder"],
@@ -1621,7 +1630,7 @@
       "id": "433d6e9d-9d03-4042-9ee0-6284570f8a3c",
       "comment": "",
       "command": "type",
-      "target": "css=section > div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(8) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[2]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["id=field83", "id"],
         ["css=#field83", "css:finder"],
@@ -1633,15 +1642,24 @@
     }, {
       "id": "26146f5e-533f-42c6-b1e6-e107a471ba8f",
       "comment": "",
-      "command": "sendKeys",
-      "target": "css=section > div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(8) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
-      "targets": [],
-      "value": "${KEY_ENTER}"
+      "command": "click",
+      "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4",
+      "targets": [
+        ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", "id"],
+        ["linkText=somethingElse", "linkText"],
+        ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", "css:finder"],
+        ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4']", "xpath:attributes"],
+        ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_4']/a[5]", "xpath:idRelative"],
+        ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"],
+        ["xpath=//a[5]", "xpath:position"],
+        ["xpath=//a[contains(.,'somethingElse')]", "xpath:innerText"]
+      ],
+      "value": ""
     }, {
       "id": "c8bb3bee-3d61-4324-a3aa-38b78232b969",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=.row:nth-child(9) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[25]", "xpath:attributes"],
@@ -1660,7 +1678,7 @@
       "id": "cbf15c4c-35d9-4f80-ba3d-bfe960048cd1",
       "comment": "",
       "command": "click",
-      "target": "css=section > div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > button",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div/div/div[1]/div/div[1]/div/div/button",
       "targets": [
         ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/0-container .btn", "css:finder"],
         ["xpath=(//button[@type='button'])[7]", "xpath:attributes"],
@@ -1695,7 +1713,7 @@
       "id": "ed769470-9c3f-4c23-bbed-85513dcea800",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=div:nth-child(9) .d-flex > .btn", "css:finder"],
         ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button", "xpath:position"]
@@ -1712,7 +1730,7 @@
       "id": "2b063eb8-f2d6-4a59-85bb-b04c467d9874",
       "comment": "",
       "command": "click",
-      "target": "css=section > div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(2) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > button",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[2]/div/div[1]/div/div[1]/div/div/button",
       "targets": [
         ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/1-container .btn", "css:finder"],
         ["xpath=(//button[@type='button'])[8]", "xpath:attributes"],
@@ -1747,7 +1765,7 @@
       "id": "892ddc96-970b-4dde-9189-0dc9ed197dab",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=div:nth-child(9) .d-flex > .btn", "css:finder"],
         ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button", "xpath:position"]
@@ -1764,7 +1782,7 @@
       "id": "64e215d9-6e46-422f-882c-13b6fb102622",
       "comment": "",
       "command": "click",
-      "target": "css=section > div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(3) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > button",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[3]/div/div[1]/div/div[1]/div/div/button",
       "targets": [
         ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/2-container .btn", "css:finder"],
         ["xpath=(//button[@type='button'])[9]", "xpath:attributes"],
@@ -1799,7 +1817,7 @@
       "id": "f0dd4b79-eab5-4d4b-af2e-07ca661f8288",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=div:nth-child(9) .btn > translate-i18n", "css:finder"],
         ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button/translate-i18n", "xpath:position"]
@@ -1809,7 +1827,7 @@
       "id": "dacd34b0-9e48-4838-b137-bf22dd027ed0",
       "comment": "",
       "command": "click",
-      "target": "css=section > div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(4) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[4]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["id=/relyingPartyOverrides/authenticationMethods/3", "id"],
         ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/3", "css:finder"],
@@ -1822,7 +1840,7 @@
       "id": "cc9dd18b-ee87-4aa7-91f2-59f02834759b",
       "comment": "",
       "command": "type",
-      "target": "css=section > div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(4) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[4]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["id=field87", "id"],
         ["css=#field87", "css:finder"],
@@ -1834,10 +1852,19 @@
     }, {
       "id": "7e80934c-c706-42e3-84c2-012dfcfb88a3",
       "comment": "",
-      "command": "sendKeys",
-      "target": "css=section > div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(4) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
-      "targets": [],
-      "value": "${KEY_ENTER}"
+      "command": "click",
+      "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3",
+      "targets": [
+        ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", "id"],
+        ["linkText=otherThings", "linkText"],
+        ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", "css:finder"],
+        ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3']", "xpath:attributes"],
+        ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_3']/a[4]", "xpath:idRelative"],
+        ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"],
+        ["xpath=//a[4]", "xpath:position"],
+        ["xpath=//a[contains(.,'otherThings')]", "xpath:innerText"]
+      ],
+      "value": ""
     }, {
       "id": "7c85fe59-dc95-4328-a010-33d1a06a5ce5",
       "comment": "",
@@ -1923,11 +1950,12 @@
       "id": "e53030b6-f344-4361-981d-b8303a721c5d",
       "comment": "",
       "command": "assertText",
-      "target": "css=.d-flex:nth-child(8) .d-flex:nth-child(5)",
+      "target": "css=.mb-4:nth-child(4) .d-flex:nth-child(5) > .d-block",
       "targets": [
-        ["css=.d-flex:nth-child(8) .d-flex:nth-child(5)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[8]/ul/li[5]", "xpath:idRelative"],
-        ["xpath=//div[8]/ul/li[5]", "xpath:position"]
+        ["css=.mb-4:nth-child(4) .d-flex:nth-child(5) > .d-block", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[4]/div/div[2]/div[2]/div/div[2]/ul/li[5]/span", "xpath:idRelative"],
+        ["xpath=//li[5]/span", "xpath:position"],
+        ["xpath=//span[contains(.,'somethingElse')]", "xpath:innerText"]
       ],
       "value": "somethingElse"
     }, {
@@ -2209,11 +2237,11 @@
       "id": "951a21c9-4cd3-4989-8dc0-77760ca0dc95",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)",
+      "target": "css=.mb-4:nth-child(9) div:nth-child(3) .d-block:nth-child(2)",
       "targets": [
-        ["css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"],
+        ["css=.mb-4:nth-child(9) div:nth-child(3) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[3]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//section[7]/div/div[2]/div[2]/div/div[3]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'responder-id-123')]", "xpath:innerText"]
       ],
       "value": "responder-id-123"
diff --git a/backend/src/integration/resources/SHIBUI-1335-1.side b/backend/src/integration/resources/SHIBUI-1335-1.side
index e66a063bd..0a58996dd 100644
--- a/backend/src/integration/resources/SHIBUI-1335-1.side
+++ b/backend/src/integration/resources/SHIBUI-1335-1.side
@@ -851,7 +851,7 @@
       "id": "027b4448-eaf6-4f24-ae2f-5b592db910ed",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=.row:nth-child(8) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[18]", "xpath:attributes"],
@@ -906,7 +906,7 @@
       "id": "d8e3df44-0db6-458e-b133-36b7ec08fbb7",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=div:nth-child(8) .btn > translate-i18n", "css:finder"],
         ["xpath=//array-component/div/div/button/translate-i18n", "xpath:position"]
@@ -958,7 +958,7 @@
       "id": "4e595806-b2c6-43c6-bd1f-78e659f795e4",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=div:nth-child(8) .d-flex > .btn", "css:finder"],
         ["xpath=//array-component/div/div/button", "xpath:position"],
@@ -1011,7 +1011,7 @@
       "id": "9902d02a-d7f7-4424-92f4-2a6072916421",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=div:nth-child(8) .d-flex > .btn", "css:finder"],
         ["xpath=//array-component/div/div/button", "xpath:position"],
@@ -1060,11 +1060,29 @@
         ["xpath=//a[contains(.,'urn:oasis:names:tc:SAML:2.0:nameid-format:transient')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "290e296a-97a9-41e3-bbd8-51edfebc550b",
+      "comment": "",
+      "command": "click",
+      "target": "css=.row:nth-child(2) .array-add-button",
+      "targets": [
+        ["css=div:nth-child(8) .d-flex > .btn", "css:finder"],
+        ["xpath=//array-component/div/div/button", "xpath:position"],
+        ["xpath=//button[contains(.,'Add   ')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "fabcaffe-4f57-45ab-ad6d-8901a14da678",
+      "comment": "",
+      "command": "pause",
+      "target": "500",
+      "targets": [],
+      "value": ""
     }, {
       "id": "624fd275-3ee2-4cd0-890a-4ae22b152ed4",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "xpath=//section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div[1]/div/div[7]/div/div/div[1]/div/div[2]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["css=div:nth-child(8) .d-flex > .btn", "css:finder"],
         ["xpath=//array-component/div/div/button", "xpath:position"],
@@ -1075,7 +1093,7 @@
       "id": "e6c3d2db-386e-4b9b-a160-c091b025c1b9",
       "comment": "",
       "command": "type",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div > div:nth-child(3) > div:nth-child(3) > div.col-lg-9 > div > form > div > div:nth-child(1) > div > div:nth-child(7) > div > div > div:nth-child(1) > div > div:nth-child(8) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div[1]/div/div[7]/div/div/div[1]/div/div[2]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["css=.focus", "css:finder"],
         ["xpath=(//input[@value=''])[10]", "xpath:attributes"],
@@ -1086,15 +1104,15 @@
     }, {
       "id": "0c417f2a-a400-4b34-91fc-e73efb92faff",
       "comment": "",
-      "command": "sendKeys",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div > div:nth-child(3) > div:nth-child(3) > div.col-lg-9 > div > form > div > div:nth-child(1) > div > div:nth-child(7) > div > div > div:nth-child(1) > div > div:nth-child(8) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "command": "click",
+      "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4",
       "targets": [],
-      "value": "${KEY_ENTER}"
+      "value": ""
     }, {
       "id": "82093807-448e-4a25-96bf-ed1dfca77452",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=.row:nth-child(9) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[30]", "xpath:attributes"],
@@ -1113,7 +1131,7 @@
       "id": "fcd7d891-5ea4-45a6-8554-4298ec5804c9",
       "comment": "",
       "command": "click",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div > div:nth-child(3) > div:nth-child(3) > div.col-lg-9 > div > form > div > div:nth-child(1) > div > div:nth-child(7) > div > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > button",
+      "target": "xpath=//section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div[1]/div/div[7]/div/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[1]/div/div[1]/div/div[1]/div/div/button",
       "targets": [
         ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/0-container .btn", "css:finder"],
         ["xpath=(//button[@type='button'])[8]", "xpath:attributes"],
@@ -1148,7 +1166,7 @@
       "id": "743e6d84-98b7-461a-8fb9-05826abb8e22",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=div:nth-child(9) .d-flex > .btn", "css:finder"],
         ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button", "xpath:position"]
@@ -1165,7 +1183,7 @@
       "id": "81517bc9-7996-46be-9dfe-9eea57f0e616",
       "comment": "",
       "command": "click",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div > div:nth-child(3) > div:nth-child(3) > div.col-lg-9 > div > form > div > div:nth-child(1) > div > div:nth-child(7) > div > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(2) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > button",
+      "target": "xpath=//section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div[1]/div/div[7]/div/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[2]/div/div[1]/div/div[1]/div/div/button",
       "targets": [
         ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/1-container .btn", "css:finder"],
         ["xpath=(//button[@type='button'])[9]", "xpath:attributes"],
@@ -1200,7 +1218,7 @@
       "id": "7a3a49b4-4348-4318-a35c-ba0a2192e811",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=div:nth-child(9) .d-flex > .btn", "css:finder"],
         ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button", "xpath:position"]
@@ -1217,7 +1235,7 @@
       "id": "c2f97ae8-fddf-4e48-b961-1d4154ceae9f",
       "comment": "",
       "command": "click",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div > div:nth-child(3) > div:nth-child(3) > div.col-lg-9 > div > form > div > div:nth-child(1) > div > div:nth-child(7) > div > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(3) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > button",
+      "target": "xpath=//section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div[1]/div/div[7]/div/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[3]/div/div[1]/div/div[1]/div/div/button",
       "targets": [
         ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/2-container .btn", "css:finder"],
         ["xpath=(//button[@type='button'])[10]", "xpath:attributes"],
@@ -1252,7 +1270,7 @@
       "id": "efad42c9-5d79-42f6-a348-54ba5fe59e9d",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=div:nth-child(9) .d-flex > .btn", "css:finder"],
         ["xpath=//div[9]/sf-form-element/div/sf-widget-chooser/array-component/div/div/button", "xpath:position"]
@@ -1262,7 +1280,7 @@
       "id": "9a7b2bfe-8702-40be-a6fe-a76b9a01cdde",
       "comment": "",
       "command": "type",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div > div:nth-child(3) > div:nth-child(3) > div.col-lg-9 > div > form > div > div:nth-child(1) > div > div:nth-child(7) > div > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(4) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div[1]/div/div[7]/div/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[4]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["css=.focus", "css:finder"],
         ["xpath=(//input[@value=''])[18]", "xpath:attributes"],
@@ -1273,10 +1291,10 @@
     }, {
       "id": "9a850c80-fc21-48c8-b146-a665307c5ac6",
       "comment": "",
-      "command": "sendKeys",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div > div:nth-child(3) > div:nth-child(3) > div.col-lg-9 > div > form > div > div:nth-child(1) > div > div:nth-child(7) > div > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(4) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "command": "click",
+      "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3",
       "targets": [],
-      "value": "${KEY_ENTER}"
+      "value": ""
     }, {
       "id": "82bf7075-6128-4471-a631-c8e4c3525eea",
       "comment": "",
@@ -1679,7 +1697,7 @@
       "id": "f0ae75e7-b2c0-49fa-9806-23f4f228e3e1",
       "comment": "",
       "command": "type",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div > div:nth-child(3) > div:nth-child(3) > div.col-lg-9 > div > form > div > div:nth-child(1) > div > div:nth-child(8) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div[1]/div/div[8]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["css=.focus", "css:finder"],
         ["xpath=(//input[@value=''])[9]", "xpath:attributes"],
@@ -1690,10 +1708,19 @@
     }, {
       "id": "fffef61c-1c28-4180-b337-00b69a0148d3",
       "comment": "",
-      "command": "sendKeys",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div > div:nth-child(3) > div:nth-child(3) > div.col-lg-9 > div > form > div > div:nth-child(1) > div > div:nth-child(8) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
-      "targets": [],
-      "value": "${KEY_ENTER}"
+      "command": "click",
+      "target": "id=option-selector-root_formats_4-item-4",
+      "targets": [
+        ["id=option-selector-root_formats_4-item-4", "id"],
+        ["linkText=name id format", "linkText"],
+        ["css=#option-selector-root_formats_4-item-4", "css:finder"],
+        ["xpath=//a[@id='option-selector-root_formats_4-item-4']", "xpath:attributes"],
+        ["xpath=//div[@id='option-selector-root_formats_4']/a[5]", "xpath:idRelative"],
+        ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"],
+        ["xpath=//a[5]", "xpath:position"],
+        ["xpath=//a[contains(.,'name id format')]", "xpath:innerText"]
+      ],
+      "value": ""
     }, {
       "id": "3a97e6c5-badb-45c8-b6e5-a7e8462ee77f",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1335-4.side b/backend/src/integration/resources/SHIBUI-1335-4.side
index a8c7d3ae6..512c5b5c2 100644
--- a/backend/src/integration/resources/SHIBUI-1335-4.side
+++ b/backend/src/integration/resources/SHIBUI-1335-4.side
@@ -865,7 +865,7 @@
       "id": "c722da17-b739-4fa6-b731-8b347e3c96e3",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=.row:nth-child(8) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[18]", "xpath:attributes"],
@@ -1056,11 +1056,11 @@
       "id": "81373637-8e36-4736-9b2a-7b8d477dc2c1",
       "comment": "",
       "command": "click",
-      "target": "id=dropdown-",
+      "target": "id=dropdown-label.filter-target-type",
       "targets": [
-        ["id=dropdown-", "id"],
-        ["css=#dropdown-", "css:finder"],
-        ["xpath=//button[@id='dropdown-']", "xpath:attributes"],
+        ["id=dropdown-label.filter-target-type", "id"],
+        ["css=#dropdown-label\\.filter-target-type", "css:finder"],
+        ["xpath=//button[@id='dropdown-label.filter-target-type']", "xpath:attributes"],
         ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[3]/div/div/div/fieldset/div/div/div/div/button", "xpath:idRelative"],
         ["xpath=//fieldset/div/div/div/div/button", "xpath:position"],
         ["xpath=//button[contains(.,'Entity ID ')]", "xpath:innerText"]
diff --git a/backend/src/integration/resources/SHIBUI-1364-1.side b/backend/src/integration/resources/SHIBUI-1364-1.side
index 573496e81..15d1857a8 100644
--- a/backend/src/integration/resources/SHIBUI-1364-1.side
+++ b/backend/src/integration/resources/SHIBUI-1364-1.side
@@ -664,16 +664,22 @@
     }, {
       "id": "f62f8d1d-8c53-4cb5-bc19-84f68fee870d",
       "comment": "",
-      "command": "pause",
-      "target": "5000",
+      "command": "waitForElementPresent",
+      "target": "name=type",
       "targets": [],
-      "value": ""
+      "value": "30000"
     }, {
       "id": "dc41b26d-b101-4ead-866f-482df0bfee04",
       "comment": "",
       "command": "select",
       "target": "name=type",
-      "targets": [],
+      "targets": [
+        ["name=type", "name"],
+        ["css=.custom-select", "css:finder"],
+        ["xpath=//select[@name='type']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div/div/div/div/form/div/select", "xpath:idRelative"],
+        ["xpath=//select", "xpath:position"]
+      ],
       "value": "label=EntityAttributes"
     }, {
       "id": "49fe7508-4f42-4eae-a47d-85a0983efb64",
@@ -910,7 +916,7 @@
       "id": "7753fdc3-fb29-436e-aa16-c331fa4772d6",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=.row:nth-child(8) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[18]", "xpath:attributes"],
@@ -951,7 +957,7 @@
       "id": "7e21402f-383c-4995-89b6-b75db89c0ab5",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button > .svg-inline--fa",
+      "target": "css=.row:nth-child(2) .array-add-button > .svg-inline--fa",
       "targets": [
         ["css=.row:nth-child(8) .array-add-button > .svg-inline--fa", "css:finder"]
       ],
@@ -984,7 +990,7 @@
       "id": "8fbcab89-08ff-4c40-a2bc-79674b75720c",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=.row:nth-child(8) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[18]", "xpath:attributes"],
@@ -1021,7 +1027,7 @@
       "id": "72506b7c-224d-4c45-81e6-1b1e5f3a08b8",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=.row:nth-child(8) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[18]", "xpath:attributes"],
@@ -1059,7 +1065,7 @@
       "id": "bac85588-bf58-4e2a-ba71-6d0a3941631e",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=.row:nth-child(8) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[18]", "xpath:attributes"],
@@ -1072,7 +1078,7 @@
       "id": "dd44bd2e-84dc-4512-966f-97f893f530e9",
       "comment": "",
       "command": "click",
-      "target": "css=#root > div > main > div > section > div.section-body.p-4.border.border-top-0.border-info > div > div:nth-child(3) > div:nth-child(3) > div.col-lg-9 > div > form > div > div:nth-child(1) > div > div:nth-child(7) > div > div > div:nth-child(1) > div > div:nth-child(8) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div[1]/div/div[7]/div/div/div[1]/div/div[2]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["css=.focus", "css:finder"],
         ["xpath=(//input[@value=''])[5]", "xpath:attributes"],
@@ -1084,7 +1090,7 @@
       "id": "2d2e92a4-213d-4345-9b1c-f6fb04df3971",
       "comment": "",
       "command": "type",
-      "target": "css=#root > div > main > div > section > div.section-body.p-4.border.border-top-0.border-info > div > div:nth-child(3) > div:nth-child(3) > div.col-lg-9 > div > form > div > div:nth-child(1) > div > div:nth-child(7) > div > div > div:nth-child(1) > div > div:nth-child(8) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div[1]/div/div[7]/div/div/div[1]/div/div[2]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["css=.focus", "css:finder"],
         ["xpath=//input[@value='someNameID']", "xpath:attributes"],
@@ -1093,22 +1099,26 @@
       ],
       "value": "someNameID"
     }, {
-      "id": "8384cd5e-7678-4de9-96c6-7d81ac9591ce",
+      "id": "22098498-fa16-468f-abfa-768e5736d317",
       "comment": "",
-      "command": "sendKeys",
-      "target": "css=#root > div > main > div > section > div.section-body.p-4.border.border-top-0.border-info > div > div:nth-child(3) > div:nth-child(3) > div.col-lg-9 > div > form > div > div:nth-child(1) > div > div:nth-child(7) > div > div > div:nth-child(1) > div > div:nth-child(8) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "command": "click",
+      "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4",
       "targets": [
-        ["css=.focus", "css:finder"],
-        ["xpath=//input[@value='someNameID']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div[8]/div/div/div/div/div/div[2]/div[5]/div/div/div/div/div/div/div/input", "xpath:idRelative"],
-        ["xpath=//div[5]/div/div/div/div/div/div/div/input", "xpath:position"]
+        ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", "id"],
+        ["linkText=someNameID", "linkText"],
+        ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", "css:finder"],
+        ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4']", "xpath:attributes"],
+        ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_4']/a[5]", "xpath:idRelative"],
+        ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"],
+        ["xpath=//a[5]", "xpath:position"],
+        ["xpath=//a[contains(.,'someNameID')]", "xpath:innerText"]
       ],
-      "value": "${KEY_ENTER}"
+      "value": ""
     }, {
       "id": "f2443263-2147-4457-ae68-9c46bb38940a",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=.row:nth-child(9) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[30]", "xpath:attributes"],
@@ -1120,7 +1130,7 @@
       "id": "22ce2ccc-94d9-4b6c-8a6c-7544af49e00a",
       "comment": "",
       "command": "click",
-      "target": "css=.is-invalid > .toggle-button",
+      "target": "xpath=//section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div[1]/div/div[7]/div/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div/div/div[1]/div/div[1]/div/div/button",
       "targets": [
         ["css=.is-invalid > .toggle-button", "css:finder"],
         ["xpath=(//button[@type='button'])[32]", "xpath:attributes"],
@@ -1148,7 +1158,7 @@
       "id": "ccd54cce-a783-4dbd-b64e-1932286b4a08",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=.row:nth-child(9) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[30]", "xpath:attributes"],
@@ -1160,7 +1170,7 @@
       "id": "00087e23-8d82-4dc1-ae12-8043589e08f1",
       "comment": "",
       "command": "click",
-      "target": "css=.is-invalid > .toggle-button",
+      "target": "xpath=//section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div[1]/div/div[7]/div/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[2]/div/div[1]/div/div[1]/div/div/button",
       "targets": [
         ["css=.is-invalid > .toggle-button", "css:finder"],
         ["xpath=(//button[@type='button'])[34]", "xpath:attributes"],
@@ -1188,19 +1198,19 @@
       "id": "58dc23a7-adae-4b09-a056-c1facfc3db89",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
-        ["css=.row:nth-child(9) .array-add-button", "css:finder"],
-        ["xpath=(//button[@type='button'])[30]", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div[9]/div/div/div/div/div/div/button", "xpath:idRelative"],
-        ["xpath=//div[9]/div/div/div/div/div/div/button", "xpath:position"]
+        ["css=.row:nth-child(4) .array-add-button", "css:finder"],
+        ["xpath=(//button[@type='button'])[25]", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div[4]/div/div/div/div/div/div/button", "xpath:idRelative"],
+        ["xpath=//div[7]/div/div/div/div/div[4]/div/div/div/div/div/div/button", "xpath:position"]
       ],
       "value": ""
     }, {
       "id": "b1429afc-4501-4fb3-acf7-02f2cb90f7f3",
       "comment": "",
       "command": "click",
-      "target": "css=.is-invalid > .toggle-button",
+      "target": "xpath=//section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div[1]/div/div[7]/div/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[3]/div/div[1]/div/div[1]/div/div/button",
       "targets": [
         ["css=.is-invalid > .toggle-button", "css:finder"],
         ["xpath=(//button[@type='button'])[36]", "xpath:attributes"],
@@ -1224,7 +1234,7 @@
       "id": "268e6828-97c8-4f68-9f2d-9c443b16dcef",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=.row:nth-child(9) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[30]", "xpath:attributes"],
@@ -1236,7 +1246,7 @@
       "id": "b6dc2be5-574b-4fd6-b1a1-786303efc60a",
       "comment": "",
       "command": "click",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div > div:nth-child(3) > div:nth-child(3) > div.col-lg-9 > div > form > div > div:nth-child(1) > div > div:nth-child(7) > div > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(4) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div[1]/div/div[7]/div/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[4]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["css=.focus", "css:finder"],
         ["xpath=(//input[@value=''])[9]", "xpath:attributes"],
@@ -1248,7 +1258,7 @@
       "id": "28aa7d61-803f-48af-a103-5945f84a1601",
       "comment": "",
       "command": "type",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div > div:nth-child(3) > div:nth-child(3) > div.col-lg-9 > div > form > div > div:nth-child(1) > div > div:nth-child(7) > div > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(4) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div[1]/div/div[7]/div/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[4]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["css=.focus", "css:finder"],
         ["xpath=//input[@value='SomeAuthnMethod']", "xpath:attributes"],
@@ -1259,15 +1269,19 @@
     }, {
       "id": "3d9af697-8021-4a7b-bc09-7fbcc501817e",
       "comment": "",
-      "command": "sendKeys",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div > div:nth-child(3) > div:nth-child(3) > div.col-lg-9 > div > form > div > div:nth-child(1) > div > div:nth-child(7) > div > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(4) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "command": "click",
+      "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3",
       "targets": [
-        ["css=.focus", "css:finder"],
-        ["xpath=//input[@value='SomeAuthnMethod']", "xpath:attributes"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[7]/div/div/div/div/div[9]/div/div/div/div/div/div[2]/div[4]/div/div/div/div/div/div/div/input", "xpath:idRelative"],
-        ["xpath=//div[9]/div/div/div/div/div/div[2]/div[4]/div/div/div/div/div/div/div/input", "xpath:position"]
+        ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", "id"],
+        ["linkText=SomeAuthnMethod", "linkText"],
+        ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", "css:finder"],
+        ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3']", "xpath:attributes"],
+        ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_3']/a[4]", "xpath:idRelative"],
+        ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"],
+        ["xpath=//a[4]", "xpath:position"],
+        ["xpath=//a[contains(.,'SomeAuthnMethod')]", "xpath:innerText"]
       ],
-      "value": "${KEY_ENTER}"
+      "value": ""
     }, {
       "id": "82bf7075-6128-4471-a631-c8e4c3525eea",
       "comment": "",
@@ -1307,6 +1321,13 @@
         ["xpath=//a[contains(.,'Add Filter')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "53ed1d39-156e-44ed-81a7-7c1aed296ff6",
+      "comment": "",
+      "command": "waitForElementPresent",
+      "target": "name=type",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "097ea9f6-e75c-41a3-b4e9-a4a80a866802",
       "comment": "",
@@ -1363,11 +1384,11 @@
       "id": "abfa17d5-ebfe-4bb2-b64a-ef5f127bac86",
       "comment": "",
       "command": "click",
-      "target": "id=dropdown-",
+      "target": "id=dropdown-label.filter-target-type",
       "targets": [
-        ["id=dropdown-", "id"],
-        ["css=#dropdown-", "css:finder"],
-        ["xpath=//button[@id='dropdown-']", "xpath:attributes"],
+        ["id=dropdown-label.filter-target-type", "id"],
+        ["css=#dropdown-label\\.filter-target-type", "css:finder"],
+        ["xpath=//button[@id='dropdown-label.filter-target-type']", "xpath:attributes"],
         ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[3]/div/div/div/fieldset/div/div/div/div/button", "xpath:idRelative"],
         ["xpath=//fieldset/div/div/div/div/button", "xpath:position"],
         ["xpath=//button[contains(.,'Entity ID ')]", "xpath:innerText"]
@@ -1640,7 +1661,7 @@
       "id": "c18de9c9-ff9e-4784-897f-9b081102aa9e",
       "comment": "",
       "command": "click",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div > div:nth-child(3) > div:nth-child(3) > div.col-lg-9 > div > form > div > div:nth-child(1) > div > div:nth-child(8) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div[1]/div/div[8]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["css=.focus", "css:finder"],
         ["xpath=(//input[@value=''])[5]", "xpath:attributes"],
@@ -1652,7 +1673,7 @@
       "id": "3d49dbfc-47e9-4629-a27c-1013e0e2bdac",
       "comment": "",
       "command": "type",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div > div:nth-child(3) > div:nth-child(3) > div.col-lg-9 > div > form > div > div:nth-child(1) > div > div:nth-child(8) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div[1]/div/div[8]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["css=.focus", "css:finder"],
         ["xpath=//input[@value='SomeOtherNameIDFormat']", "xpath:attributes"],
@@ -1663,15 +1684,19 @@
     }, {
       "id": "875914ff-80a4-41cd-ab6c-602d1ddaaa8f",
       "comment": "",
-      "command": "sendKeys",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div > div:nth-child(3) > div:nth-child(3) > div.col-lg-9 > div > form > div > div:nth-child(1) > div > div:nth-child(8) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "command": "click",
+      "target": "id=option-selector-root_formats_4-item-4",
       "targets": [
-        ["css=.focus", "css:finder"],
-        ["xpath=//input[@value='SomeOtherNameIDFormat']", "xpath:attributes"],
-        ["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/div/div/div[2]/div[5]/div/div/div/div/div/div/div/input", "xpath:idRelative"],
-        ["xpath=//div[5]/div/div/div/div/div/div/div/input", "xpath:position"]
+        ["id=option-selector-root_formats_4-item-4", "id"],
+        ["linkText=SomeOtherNameIDFormat", "linkText"],
+        ["css=#option-selector-root_formats_4-item-4", "css:finder"],
+        ["xpath=//a[@id='option-selector-root_formats_4-item-4']", "xpath:attributes"],
+        ["xpath=//div[@id='option-selector-root_formats_4']/a[5]", "xpath:idRelative"],
+        ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"],
+        ["xpath=//a[5]", "xpath:position"],
+        ["xpath=//a[contains(.,'SomeOtherNameIDFormat')]", "xpath:innerText"]
       ],
-      "value": "${KEY_ENTER}"
+      "value": ""
     }, {
       "id": "4ae2793d-9d5a-4416-9875-97a7bbfee59f",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1364-4.side b/backend/src/integration/resources/SHIBUI-1364-4.side
index e201417e5..45011a7c0 100644
--- a/backend/src/integration/resources/SHIBUI-1364-4.side
+++ b/backend/src/integration/resources/SHIBUI-1364-4.side
@@ -848,7 +848,7 @@
       "id": "93505bd6-8a5e-4ef0-8f50-d2dc9bce71d6",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=.row:nth-child(8) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[18]", "xpath:attributes"],
@@ -1029,11 +1029,11 @@
       "id": "81373637-8e36-4736-9b2a-7b8d477dc2c1",
       "comment": "",
       "command": "click",
-      "target": "id=dropdown-",
+      "target": "id=dropdown-label.filter-target-type",
       "targets": [
-        ["id=dropdown-", "id"],
-        ["css=#dropdown-", "css:finder"],
-        ["xpath=//button[@id='dropdown-']", "xpath:attributes"],
+        ["id=dropdown-label.filter-target-type", "id"],
+        ["css=#dropdown-label\\.filter-target-type", "css:finder"],
+        ["xpath=//button[@id='dropdown-label.filter-target-type']", "xpath:attributes"],
         ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[3]/div/div/div/fieldset/div/div/div/div/button", "xpath:idRelative"],
         ["xpath=//fieldset/div/div/div/div/button", "xpath:position"],
         ["xpath=//button[contains(.,'Entity ID ')]", "xpath:innerText"]
diff --git a/backend/src/integration/resources/SHIBUI-1385-1.side b/backend/src/integration/resources/SHIBUI-1385-1.side
index 887056773..48940bee7 100644
--- a/backend/src/integration/resources/SHIBUI-1385-1.side
+++ b/backend/src/integration/resources/SHIBUI-1385-1.side
@@ -793,7 +793,7 @@
       "id": "23fd8856-32df-48ed-a198-a74e8ca71b10",
       "comment": "",
       "command": "type",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(5) > div > div:nth-child(1) > div > div:nth-child(2) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[5]/div/div[1]/div/div[2]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["css=.focus", "css:finder"],
         ["xpath=(//input[@value=''])[9]", "xpath:attributes"],
@@ -804,10 +804,19 @@
     }, {
       "id": "ac842b8d-4596-4749-85c6-4657cb499b83",
       "comment": "",
-      "command": "sendKeys",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(5) > div > div:nth-child(1) > div > div:nth-child(2) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
-      "targets": [],
-      "value": "${KEY_ENTER}"
+      "command": "click",
+      "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4",
+      "targets": [
+        ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "id"],
+        ["linkText=somethingElse", "linkText"],
+        ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "css:finder"],
+        ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4']", "xpath:attributes"],
+        ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4']/a[5]", "xpath:idRelative"],
+        ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"],
+        ["xpath=//a[5]", "xpath:position"],
+        ["xpath=//a[contains(.,'somethingElse')]", "xpath:innerText"]
+      ],
+      "value": ""
     }, {
       "id": "4f61120b-7c6b-4f8e-8543-898298451a56",
       "comment": "",
@@ -1401,7 +1410,7 @@
       "id": "ba74d18d-0996-485f-8a9f-01a39428eb0c",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=.row:nth-child(8) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[13]", "xpath:attributes"],
@@ -1456,7 +1465,7 @@
       "id": "ec3afb37-30b4-4d07-93a6-dcf022605532",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=.row:nth-child(8) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[13]", "xpath:attributes"],
@@ -1511,7 +1520,7 @@
       "id": "8b340d1f-4944-4d10-a4cd-5e79be6804ef",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=.row:nth-child(8) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[13]", "xpath:attributes"],
@@ -1566,7 +1575,7 @@
       "id": "d6e7a640-a578-415b-9c1b-b2313b62ad46",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=.row:nth-child(8) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[13]", "xpath:attributes"],
@@ -1621,7 +1630,7 @@
       "id": "4c15be93-75be-4673-b703-07a705300d0f",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=.row:nth-child(8) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[13]", "xpath:attributes"],
@@ -1634,7 +1643,7 @@
       "id": "1a1b509e-1768-4291-820d-26f4b73a9d71",
       "comment": "",
       "command": "click",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(8) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[2]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["css=.focus", "css:finder"],
         ["xpath=(//input[@value=''])[10]", "xpath:attributes"],
@@ -1646,7 +1655,7 @@
       "id": "433d6e9d-9d03-4042-9ee0-6284570f8a3c",
       "comment": "",
       "command": "type",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(8) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[2]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["id=field83", "id"],
         ["css=#field83", "css:finder"],
@@ -1658,15 +1667,24 @@
     }, {
       "id": "d378468f-965e-4d99-8429-2e4100b3a161",
       "comment": "",
-      "command": "sendKeys",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(8) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
-      "targets": [],
-      "value": "${KEY_ENTER}"
+      "command": "click",
+      "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4",
+      "targets": [
+        ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", "id"],
+        ["linkText=somethingElse", "linkText"],
+        ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", "css:finder"],
+        ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4']", "xpath:attributes"],
+        ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_4']/a[5]", "xpath:idRelative"],
+        ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"],
+        ["xpath=//a[5]", "xpath:position"],
+        ["xpath=//a[contains(.,'somethingElse')]", "xpath:innerText"]
+      ],
+      "value": ""
     }, {
       "id": "c8bb3bee-3d61-4324-a3aa-38b78232b969",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=.row:nth-child(9) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[25]", "xpath:attributes"],
@@ -1685,7 +1703,7 @@
       "id": "cbf15c4c-35d9-4f80-ba3d-bfe960048cd1",
       "comment": "",
       "command": "click",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > button",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div/div/div[1]/div/div[1]/div/div/button",
       "targets": [
         ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/0-container .btn", "css:finder"],
         ["xpath=(//button[@type='button'])[7]", "xpath:attributes"],
@@ -1717,7 +1735,7 @@
       "id": "ed769470-9c3f-4c23-bbed-85513dcea800",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=.row:nth-child(9) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[25]", "xpath:attributes"],
@@ -1736,7 +1754,7 @@
       "id": "2b063eb8-f2d6-4a59-85bb-b04c467d9874",
       "comment": "",
       "command": "click",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(2) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > button",
+      "target": "xpath=//div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[2]/div/div[1]/div/div[1]/div/div/button",
       "targets": [
         ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/1-container .btn", "css:finder"],
         ["xpath=(//button[@type='button'])[8]", "xpath:attributes"],
@@ -1768,7 +1786,7 @@
       "id": "892ddc96-970b-4dde-9189-0dc9ed197dab",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=.row:nth-child(9) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[25]", "xpath:attributes"],
@@ -1787,7 +1805,7 @@
       "id": "64e215d9-6e46-422f-882c-13b6fb102622",
       "comment": "",
       "command": "click",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(3) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > button",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[3]/div/div[1]/div/div[1]/div/div/button",
       "targets": [
         ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/2-container .btn", "css:finder"],
         ["xpath=(//button[@type='button'])[9]", "xpath:attributes"],
@@ -1822,7 +1840,7 @@
       "id": "f0dd4b79-eab5-4d4b-af2e-07ca661f8288",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=.row:nth-child(9) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[25]", "xpath:attributes"],
@@ -1834,7 +1852,7 @@
       "id": "dacd34b0-9e48-4838-b137-bf22dd027ed0",
       "comment": "",
       "command": "click",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(4) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[4]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["id=/relyingPartyOverrides/authenticationMethods/3", "id"],
         ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/3", "css:finder"],
@@ -1847,7 +1865,7 @@
       "id": "cc9dd18b-ee87-4aa7-91f2-59f02834759b",
       "comment": "",
       "command": "type",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(4) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[4]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["id=field87", "id"],
         ["css=#field87", "css:finder"],
@@ -1859,10 +1877,19 @@
     }, {
       "id": "e9e0639e-2f65-43eb-af05-e0565591dbdc",
       "comment": "",
-      "command": "sendKeys",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(4) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
-      "targets": [],
-      "value": "${KEY_ENTER}"
+      "command": "click",
+      "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3",
+      "targets": [
+        ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", "id"],
+        ["linkText=otherThings", "linkText"],
+        ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", "css:finder"],
+        ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3']", "xpath:attributes"],
+        ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_3']/a[4]", "xpath:idRelative"],
+        ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"],
+        ["xpath=//a[4]", "xpath:position"],
+        ["xpath=//a[contains(.,'otherThings')]", "xpath:innerText"]
+      ],
+      "value": ""
     }, {
       "id": "7c85fe59-dc95-4328-a010-33d1a06a5ce5",
       "comment": "",
@@ -1946,22 +1973,24 @@
       "id": "e53030b6-f344-4361-981d-b8303a721c5d",
       "comment": "",
       "command": "assertText",
-      "target": "css=.d-flex:nth-child(8) .d-flex:nth-child(5)",
+      "target": "css=.mb-4:nth-child(4) .d-flex:nth-child(5) > .d-block",
       "targets": [
-        ["css=.d-flex:nth-child(8) .d-flex:nth-child(5)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[8]/ul/li[5]", "xpath:idRelative"],
-        ["xpath=//div[8]/ul/li[5]", "xpath:position"]
+        ["css=.mb-4:nth-child(4) .d-flex:nth-child(5) > .d-block", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[4]/div/div[2]/div[2]/div/div[2]/ul/li[5]/span", "xpath:idRelative"],
+        ["xpath=//li[5]/span", "xpath:position"],
+        ["xpath=//span[contains(.,'somethingElse')]", "xpath:innerText"]
       ],
       "value": "somethingElse"
     }, {
       "id": "18636780-2feb-458f-97be-cf4a625b22e1",
       "comment": "",
       "command": "assertText",
-      "target": "css=.d-flex:nth-child(4) > .py-2",
+      "target": "css=.d-flex:nth-child(1) > .py-2 > span",
       "targets": [
-        ["css=.d-flex:nth-child(4) > .py-2", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[9]/div/div[2]/div[2]/div[4]/div", "xpath:idRelative"],
-        ["xpath=//div[2]/div[4]/div", "xpath:position"]
+        ["css=.d-flex:nth-child(1) > .py-2 > span", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[9]/div/div[2]/div[2]/div/div/span", "xpath:idRelative"],
+        ["xpath=//section[9]/div/div[2]/div[2]/div/div/span", "xpath:position"],
+        ["xpath=//span[contains(.,'True')]", "xpath:innerText"]
       ],
       "value": "True"
     }, {
@@ -2240,11 +2269,11 @@
       "id": "951a21c9-4cd3-4989-8dc0-77760ca0dc95",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)",
+      "target": "css=.mb-4:nth-child(9) div:nth-child(3) .d-block:nth-child(2)",
       "targets": [
-        ["css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"],
+        ["css=.mb-4:nth-child(9) div:nth-child(3) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[3]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//section[7]/div/div[2]/div[2]/div/div[3]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'responder-id-123')]", "xpath:innerText"]
       ],
       "value": "responder-id-123"
@@ -2252,11 +2281,12 @@
       "id": "e8b794fc-20e2-4317-8bdd-73eee8e94951",
       "comment": "",
       "command": "assertText",
-      "target": "css=.d-flex:nth-child(4) > .py-2",
+      "target": "css=.d-flex:nth-child(1) > .py-2 > span",
       "targets": [
-        ["css=.d-flex:nth-child(4) > .py-2", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[8]/div/div[2]/div[2]/div[4]/div", "xpath:idRelative"],
-        ["xpath=//section[8]/div/div[2]/div[2]/div[4]/div", "xpath:position"]
+        ["css=.d-flex:nth-child(1) > .py-2 > span", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[8]/div/div[2]/div[2]/div/div/span", "xpath:idRelative"],
+        ["xpath=//section[8]/div/div[2]/div[2]/div/div/span", "xpath:position"],
+        ["xpath=//span[contains(.,'True')]", "xpath:innerText"]
       ],
       "value": "True"
     }, {
@@ -2665,6 +2695,21 @@
         ["xpath=//a[contains(.,' Restore')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "1acccf5f-2f4f-4317-9acc-d648f2b61ac6",
+      "comment": "",
+      "command": "click",
+      "target": "linkText=Restore",
+      "targets": [
+        ["linkText=Restore", "linkText"],
+        ["css=.btn-primary", "css:finder"],
+        ["xpath=//a[contains(text(),'Restore')]", "xpath:link"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/div/div/a[2]", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/source/2e6145fc-09ac-44b9-adcd-f331cc011055/restore/864/common/edit')]", "xpath:href"],
+        ["xpath=//section/div/div/div/div/a[2]", "xpath:position"],
+        ["xpath=//a[contains(.,'Restore')]", "xpath:innerText"]
+      ],
+      "value": ""
     }, {
       "id": "5bb3c6c8-4bb0-43b1-8b9f-f189ccb31f50",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1385-2.side b/backend/src/integration/resources/SHIBUI-1385-2.side
index 7a392bff7..e796c9d16 100644
--- a/backend/src/integration/resources/SHIBUI-1385-2.side
+++ b/backend/src/integration/resources/SHIBUI-1385-2.side
@@ -926,6 +926,13 @@
         ["xpath=//a[contains(.,'Metadata Providers')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "d0be2c9b-8162-4315-bcfe-230d914b9748",
+      "comment": "",
+      "command": "waitForElementPresent",
+      "target": "linkText=Test Metadata Provider",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "5dd3952e-d716-4d63-8a08-23be4983da23",
       "comment": "",
@@ -940,6 +947,13 @@
         ["xpath=//a[contains(.,'Test Metadata Provider')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "5fd53667-6f71-4305-9b54-2eb00407ad82",
+      "comment": "",
+      "command": "waitForElementPresent",
+      "target": "css=.mb-4:nth-child(6) .edit-link",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "c9341f6f-4d13-4378-bb5c-0079e7535008",
       "comment": "",
@@ -1257,6 +1271,21 @@
         ["xpath=//button[contains(.,'  Restore')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "37826edc-e582-4523-add3-e8d383b23ecd",
+      "comment": "",
+      "command": "click",
+      "target": "linkText=Restore",
+      "targets": [
+        ["linkText=Restore", "linkText"],
+        ["css=.btn-primary", "css:finder"],
+        ["xpath=//a[contains(text(),'Restore')]", "xpath:link"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/div/div/a[2]", "xpath:idRelative"],
+        ["xpath=//a[contains(@href, '/metadata/provider/8be54754-c2f4-4da8-989e-2f50acd53961/restore/1016/common/edit')]", "xpath:href"],
+        ["xpath=//section/div/div/div/div/a[2]", "xpath:position"],
+        ["xpath=//a[contains(.,'Restore')]", "xpath:innerText"]
+      ],
+      "value": ""
     }, {
       "id": "e58a9927-7292-4f25-97da-e478dd9bfc22",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1392.side b/backend/src/integration/resources/SHIBUI-1392.side
index 22a4e481d..bba2d9c63 100644
--- a/backend/src/integration/resources/SHIBUI-1392.side
+++ b/backend/src/integration/resources/SHIBUI-1392.side
@@ -369,11 +369,11 @@
       "id": "c92e936c-d516-472f-9f28-36de89117e14",
       "comment": "",
       "command": "click",
-      "target": "id=dropdown-",
+      "target": "id=dropdown-label.filter-target-type",
       "targets": [
-        ["id=dropdown-", "id"],
-        ["css=#dropdown-", "css:finder"],
-        ["xpath=//button[@id='dropdown-']", "xpath:attributes"],
+        ["id=dropdown-label.filter-target-type", "id"],
+        ["css=#dropdown-label\\.filter-target-type", "css:finder"],
+        ["xpath=//button[@id='dropdown-label.filter-target-type']", "xpath:attributes"],
         ["xpath=//div[@id='root']/div/main/div/section/div[2]/div/div[2]/div[2]/div[2]/div/form/div/div/div/div[3]/div/div/div/fieldset/div/div/div/div/button", "xpath:idRelative"],
         ["xpath=//fieldset/div/div/div/div/button", "xpath:position"],
         ["xpath=//button[contains(.,'Entity ID ')]", "xpath:innerText"]
@@ -410,25 +410,25 @@
       "id": "786cd3cb-46b2-4361-b449-8f679ff97135",
       "comment": "",
       "command": "waitForElementPresent",
-      "target": "css=.codearea",
+      "target": "css=.npm__react-simple-code-editor__textarea",
       "targets": [
-        ["css=.codearea", "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[3]/div/div/div/fieldset/div/div/div[2]/div/div/div", "xpath:idRelative"],
-        ["xpath=//fieldset/div/div/div[2]/div/div/div", "xpath:position"]
+        ["css=.npm__react-simple-code-editor__textarea", "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[3]/div/div/div/fieldset/div/div/div[2]/div/div/div/div/textarea", "xpath:idRelative"],
+        ["xpath=//textarea", "xpath:position"]
       ],
       "value": "10000"
     }, {
       "id": "dcf31546-0976-44ae-9ffc-c29a5255d646",
       "comment": "",
-      "command": "editContent",
-      "target": "css=.codearea",
+      "command": "type",
+      "target": "css=.npm__react-simple-code-editor__textarea",
       "targets": [],
       "value": "eval(true);"
     }, {
       "id": "8c7fd197-7b41-4d32-95d3-e5360af438dc",
       "comment": "",
       "command": "click",
-      "target": "css=.codearea",
+      "target": "css=.npm__react-simple-code-editor__textarea",
       "targets": [],
       "value": ""
     }, {
diff --git a/backend/src/integration/resources/SHIBUI-1407-1.side b/backend/src/integration/resources/SHIBUI-1407-1.side
index 4d3f2e3f9..ef9f2f566 100644
--- a/backend/src/integration/resources/SHIBUI-1407-1.side
+++ b/backend/src/integration/resources/SHIBUI-1407-1.side
@@ -793,7 +793,7 @@
       "id": "23fd8856-32df-48ed-a198-a74e8ca71b10",
       "comment": "",
       "command": "type",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(5) > div > div:nth-child(1) > div > div:nth-child(2) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[5]/div/div[1]/div/div[2]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["id=field34", "id"],
         ["css=#field34", "css:finder"],
@@ -805,10 +805,19 @@
     }, {
       "id": "ce53cbc9-f15b-416c-9201-a56366e1837f",
       "comment": "",
-      "command": "sendKeys",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(5) > div > div:nth-child(1) > div > div:nth-child(2) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
-      "targets": [],
-      "value": "${KEY_ENTER}"
+      "command": "click",
+      "target": "id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4",
+      "targets": [
+        ["id=option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "id"],
+        ["linkText=somethingElse", "linkText"],
+        ["css=#option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4", "css:finder"],
+        ["xpath=//a[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4-item-4']", "xpath:attributes"],
+        ["xpath=//div[@id='option-selector-root_serviceProviderSsoDescriptor_nameIdFormats_4']/a[5]", "xpath:idRelative"],
+        ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"],
+        ["xpath=//a[5]", "xpath:position"],
+        ["xpath=//a[contains(.,'somethingElse')]", "xpath:innerText"]
+      ],
+      "value": ""
     }, {
       "id": "4f61120b-7c6b-4f8e-8543-898298451a56",
       "comment": "",
@@ -1402,7 +1411,7 @@
       "id": "ba74d18d-0996-485f-8a9f-01a39428eb0c",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=.row:nth-child(8) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[13]", "xpath:attributes"],
@@ -1457,7 +1466,7 @@
       "id": "ec3afb37-30b4-4d07-93a6-dcf022605532",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=.row:nth-child(8) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[13]", "xpath:attributes"],
@@ -1509,7 +1518,7 @@
       "id": "8b340d1f-4944-4d10-a4cd-5e79be6804ef",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=.row:nth-child(8) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[13]", "xpath:attributes"],
@@ -1564,7 +1573,7 @@
       "id": "d6e7a640-a578-415b-9c1b-b2313b62ad46",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=.row:nth-child(8) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[13]", "xpath:attributes"],
@@ -1619,7 +1628,7 @@
       "id": "4c15be93-75be-4673-b703-07a705300d0f",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(8) .array-add-button",
+      "target": "css=.row:nth-child(2) .array-add-button",
       "targets": [
         ["css=.row:nth-child(8) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[13]", "xpath:attributes"],
@@ -1632,7 +1641,7 @@
       "id": "1a1b509e-1768-4291-820d-26f4b73a9d71",
       "comment": "",
       "command": "click",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(8) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[2]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["id=/relyingPartyOverrides/nameIdFormats/4", "id"],
         ["css=#\\/relyingPartyOverrides\\/nameIdFormats\\/4", "css:finder"],
@@ -1645,7 +1654,7 @@
       "id": "433d6e9d-9d03-4042-9ee0-6284570f8a3c",
       "comment": "",
       "command": "type",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(8) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(5) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[2]/div/div/div[1]/div/div/div[2]/div[5]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["id=field83", "id"],
         ["css=#field83", "css:finder"],
@@ -1658,7 +1667,30 @@
       "id": "c8bb3bee-3d61-4324-a3aa-38b78232b969",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "id=option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4",
+      "targets": [
+        ["id=option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", "id"],
+        ["linkText=somethingElse", "linkText"],
+        ["css=#option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4", "css:finder"],
+        ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_4-item-4']", "xpath:attributes"],
+        ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_nameIdFormats_4']/a[5]", "xpath:idRelative"],
+        ["xpath=(//a[contains(@href, '#')])[5]", "xpath:href"],
+        ["xpath=//a[5]", "xpath:position"],
+        ["xpath=//a[contains(.,'somethingElse')]", "xpath:innerText"]
+      ],
+      "value": ""
+    }, {
+      "id": "0b950018-bd12-433a-b198-682d4ea55a90",
+      "comment": "",
+      "command": "pause",
+      "target": "500",
+      "targets": [],
+      "value": ""
+    }, {
+      "id": "a26984fc-83f5-41fc-ae39-8a0f1538f92f",
+      "comment": "",
+      "command": "click",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=.row:nth-child(9) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[25]", "xpath:attributes"],
@@ -1667,7 +1699,7 @@
       ],
       "value": ""
     }, {
-      "id": "0b950018-bd12-433a-b198-682d4ea55a90",
+      "id": "737d247b-346d-43e3-9df0-cb0b94a939b6",
       "comment": "",
       "command": "pause",
       "target": "500",
@@ -1677,7 +1709,7 @@
       "id": "cbf15c4c-35d9-4f80-ba3d-bfe960048cd1",
       "comment": "",
       "command": "click",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > button",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div/div/div[1]/div/div[1]/div/div/button",
       "targets": [
         ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/0-container .btn", "css:finder"],
         ["xpath=(//button[@type='button'])[7]", "xpath:attributes"],
@@ -1712,7 +1744,7 @@
       "id": "ed769470-9c3f-4c23-bbed-85513dcea800",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=.row:nth-child(9) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[25]", "xpath:attributes"],
@@ -1731,7 +1763,7 @@
       "id": "2b063eb8-f2d6-4a59-85bb-b04c467d9874",
       "comment": "",
       "command": "click",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(2) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > button",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[2]/div/div[1]/div/div[1]/div/div/button",
       "targets": [
         ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/1-container .btn", "css:finder"],
         ["xpath=(//button[@type='button'])[8]", "xpath:attributes"],
@@ -1766,7 +1798,7 @@
       "id": "892ddc96-970b-4dde-9189-0dc9ed197dab",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=.row:nth-child(9) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[25]", "xpath:attributes"],
@@ -1785,7 +1817,7 @@
       "id": "64e215d9-6e46-422f-882c-13b6fb102622",
       "comment": "",
       "command": "click",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(3) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > button",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[3]/div/div[1]/div/div[1]/div/div/button",
       "targets": [
         ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/2-container .btn", "css:finder"],
         ["xpath=(//button[@type='button'])[9]", "xpath:attributes"],
@@ -1820,7 +1852,7 @@
       "id": "f0dd4b79-eab5-4d4b-af2e-07ca661f8288",
       "comment": "",
       "command": "click",
-      "target": "css=.row:nth-child(9) .array-add-button",
+      "target": "css=.row:nth-child(4) .array-add-button",
       "targets": [
         ["css=.row:nth-child(9) .array-add-button", "css:finder"],
         ["xpath=(//button[@type='button'])[25]", "xpath:attributes"],
@@ -1832,7 +1864,7 @@
       "id": "dacd34b0-9e48-4838-b137-bf22dd027ed0",
       "comment": "",
       "command": "click",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(4) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[4]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["id=/relyingPartyOverrides/authenticationMethods/3", "id"],
         ["css=#\\/relyingPartyOverrides\\/authenticationMethods\\/3", "css:finder"],
@@ -1845,7 +1877,7 @@
       "id": "cc9dd18b-ee87-4aa7-91f2-59f02834759b",
       "comment": "",
       "command": "type",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(4) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
+      "target": "xpath=//section/div[2]/div[2]/div/div/form/div/div[1]/div/div/div[9]/div/div[1]/div/div[4]/div/div/div[1]/div/div/div[2]/div[4]/div/div[1]/div/div[1]/div/div/div[1]/input[1]",
       "targets": [
         ["id=field87", "id"],
         ["css=#field87", "css:finder"],
@@ -1857,10 +1889,19 @@
     }, {
       "id": "74827780-a9c2-49c6-a709-7578597bf20d",
       "comment": "",
-      "command": "sendKeys",
-      "target": "css=div.section-body.p-4.border.border-top-0.border-info > div:nth-child(3) > div > div > form > div > div:nth-child(1) > div > div > div:nth-child(9) > div > div:nth-child(1) > div > div:nth-child(9) > div > div > div:nth-child(1) > div > div > div.p-0.m-0.container-fluid > div:nth-child(4) > div > div.mr-2.flex-grow-1.undefined > div > div:nth-child(1) > div > div > div:nth-child(1) > input.rbt-input-main.form-control.rbt-input",
-      "targets": [],
-      "value": "${KEY_ENTER}"
+      "command": "click",
+      "target": "id=option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3",
+      "targets": [
+        ["id=option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", "id"],
+        ["linkText=otherThings", "linkText"],
+        ["css=#option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3", "css:finder"],
+        ["xpath=//a[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_3-item-3']", "xpath:attributes"],
+        ["xpath=//div[@id='option-selector-root_relyingPartyOverrides_authenticationMethods_3']/a[4]", "xpath:idRelative"],
+        ["xpath=(//a[contains(@href, '#')])[4]", "xpath:href"],
+        ["xpath=//a[4]", "xpath:position"],
+        ["xpath=//a[contains(.,'otherThings')]", "xpath:innerText"]
+      ],
+      "value": ""
     }, {
       "id": "7c85fe59-dc95-4328-a010-33d1a06a5ce5",
       "comment": "",
@@ -1953,11 +1994,12 @@
       "id": "e53030b6-f344-4361-981d-b8303a721c5d",
       "comment": "",
       "command": "assertText",
-      "target": "css=.d-flex:nth-child(8) .d-flex:nth-child(5)",
+      "target": "css=.mb-4:nth-child(4) .d-flex:nth-child(5) > .d-block",
       "targets": [
-        ["css=.d-flex:nth-child(8) .d-flex:nth-child(5)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[8]/div/div[2]/div[2]/div/div[8]/ul/li[5]", "xpath:idRelative"],
-        ["xpath=//div[8]/ul/li[5]", "xpath:position"]
+        ["css=.mb-4:nth-child(4) .d-flex:nth-child(5) > .d-block", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[3]/div/section[4]/div/div[2]/div[2]/div/div[2]/ul/li[5]/span", "xpath:idRelative"],
+        ["xpath=//li[5]/span", "xpath:position"],
+        ["xpath=//span[contains(.,'somethingElse')]", "xpath:innerText"]
       ],
       "value": "somethingElse"
     }, {
@@ -2228,11 +2270,11 @@
       "id": "951a21c9-4cd3-4989-8dc0-77760ca0dc95",
       "comment": "",
       "command": "assertText",
-      "target": "css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)",
+      "target": "css=.mb-4:nth-child(9) div:nth-child(3) .d-block:nth-child(2)",
       "targets": [
-        ["css=.mb-4:nth-child(9) div:nth-child(7) .d-block:nth-child(2)", "css:finder"],
-        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:idRelative"],
-        ["xpath=//section[7]/div/div[2]/div[2]/div/div[7]/div/span[2]", "xpath:position"],
+        ["css=.mb-4:nth-child(9) div:nth-child(3) .d-block:nth-child(2)", "css:finder"],
+        ["xpath=//div[@id='root']/div/main/div/section/div/div/section[7]/div/div[2]/div[2]/div/div[3]/div/span[2]", "xpath:idRelative"],
+        ["xpath=//section[7]/div/div[2]/div[2]/div/div[3]/div/span[2]", "xpath:position"],
         ["xpath=//span[contains(.,'responder-id-123')]", "xpath:innerText"]
       ],
       "value": "responder-id-123"