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 de68850a5..363f1a06f 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
@@ -154,9 +154,9 @@ class SeleniumSIDETest extends Specification {
         'SHIBUI-2052: Logged in user & role appear on dashboard'            | '/SHIBUI-2052.side'
         'SHIBUI-2116: Verify entity attribute bundle highlights'            | '/SHIBUI-2116.side' // Note that this script WILL NOT PASS in the Selenium IDE due to ${driver} not being set (it is provided by this groovy script).
         'SHIBUI-2267: Verify new RPO CRUD'                                  | '/SHIBUI-2267.side'
-        'SHIBUI-2269: Verify XML generation of external filters'            | '/SHIBUI-2269.side'
         'SHIBUI-1674: Verify metadata source tooltips'                      | '/SHIBUI-1674-1.side'
         'SHIBUI-1674: Verify metadata provider tooltips'                    | '/SHIBUI-1674-2.side'
         'SHIBUI-1674: Verify advanced menu tooltips'                        | '/SHIBUI-1674-3.side'
+        'SHIBUI-2269: Verify XML generation of external filters'            | '/SHIBUI-2269.side'
     }
 }
diff --git a/backend/src/integration/resources/SHIBUI-1674-1.side b/backend/src/integration/resources/SHIBUI-1674-1.side
index b9fed57ad..e2c62c188 100644
--- a/backend/src/integration/resources/SHIBUI-1674-1.side
+++ b/backend/src/integration/resources/SHIBUI-1674-1.side
@@ -303,7 +303,7 @@
       "command": "assertText",
       "target": "css=div[role=\"tooltip\"]",
       "targets": [],
-      "value": "Whether to sign requests."
+      "value": "Whether to sign requests. Signing requests helps to verify that the request from the SP is authentic."
     }, {
       "id": "e1c906a3-bd1d-4684-b6fb-56de3a653579",
       "comment": "",
@@ -387,7 +387,9 @@
       "command": "mouseOver",
       "target": "css=.row:nth-child(8) path:nth-child(1)",
       "targets": [
-        ["css=.row:nth-child(8) path:nth-child(1)", "css:finder"]
+        ["css=.app-root", "css:finder"],
+        ["xpath=//div[@id='root']/div", "xpath:idRelative"],
+        ["xpath=//div[3]/div", "xpath:position"]
       ],
       "value": ""
     }, {
@@ -396,7 +398,7 @@
       "command": "assertText",
       "target": "css=div[role=\"tooltip\"]",
       "targets": [],
-      "value": "Whether to ignore any SP-Requested Authentication Method."
+      "value": "Do not sign the full authentication response to the service provider. Enabling this property will reduce the size of the response to service providers who may have limitations to the size of the response."
     }, {
       "id": "87036a6f-aebd-4ef1-8cb8-03d082676c03",
       "comment": "",
@@ -719,9 +721,9 @@
       "id": "2928ba27-b934-499e-8dda-8441dbbb463d",
       "comment": "",
       "command": "mouseOver",
-      "target": "css=.row:nth-child(6) path:nth-child(1)",
+      "target": "css=.row:nth-child(7) path:nth-child(1)",
       "targets": [
-        ["css=.row:nth-child(6) path:nth-child(1)", "css:finder"]
+        ["css=.row:nth-child(7) path:nth-child(1)", "css:finder"]
       ],
       "value": ""
     }, {
@@ -732,7 +734,7 @@
       "targets": [
         ["css=.row:nth-child(1) > .col-12 .btn > .svg-inline--fa", "css:finder"]
       ],
-      "value": "Disallows use (or reuse) of authentication results and login flows that don't provide a real-time proof of user presence in the login process."
+      "value": "Disallows use (or reuse) of authentication results and login flows that don't provide a real-time proof of user presence in the login process"
     }, {
       "id": "1ff63b39-ee65-46a0-9258-56209aa63e4b",
       "comment": "",
diff --git a/backend/src/integration/resources/SHIBUI-1674-2.side b/backend/src/integration/resources/SHIBUI-1674-2.side
index f05b1e1f9..fb33695f5 100644
--- a/backend/src/integration/resources/SHIBUI-1674-2.side
+++ b/backend/src/integration/resources/SHIBUI-1674-2.side
@@ -146,9 +146,9 @@
       "id": "2f6171c0-f11f-4d3a-99fe-4ba3ef743f3f",
       "comment": "",
       "command": "mouseOver",
-      "target": "css=.mb-3:nth-child(2) path",
+      "target": "css=.mb-3:nth-child(2) .info-icon > .svg-inline--fa",
       "targets": [
-        ["css=.mb-3:nth-child(2) path", "css:finder"]
+        ["css=.mb-3:nth-child(2) .info-icon > .svg-inline--fa", "css:finder"]
       ],
       "value": ""
     }, {
@@ -396,9 +396,9 @@
       "id": "3e9efc71-b8e5-4d0e-99f1-5605f0984768",
       "comment": "",
       "command": "mouseOver",
-      "target": "css=.mb-3:nth-child(1) path",
+      "target": "css=.mb-3:nth-child(1) .info-icon path",
       "targets": [
-        ["css=.mb-3:nth-child(1) path", "css:finder"]
+        ["css=.mb-3:nth-child(1) .info-icon path", "css:finder"]
       ],
       "value": ""
     }, {
@@ -423,7 +423,7 @@
     }, {
       "id": "b83ea670-06b0-45e7-b4e3-af137de66d44",
       "comment": "",
-      "command": "waitForElementEditable",
+      "command": "waitForElementVisible",
       "target": "id=root_xmlId",
       "targets": [],
       "value": "30000"
@@ -954,7 +954,7 @@
       "command": "assertText",
       "target": "css=div[role=\"tooltip\"]",
       "targets": [],
-      "value": "Flag indicating whether should initialize from the persistent cache in the background. Initializing from the cache in the background will improve IdP startup times."
+      "value": "Flag indicating whether the system should initialize from the persistent cache in the background. Initializing from the cache in the background will improve IdP startup times."
     }, {
       "id": "d1ee0afc-651b-4da5-bd99-eac47bbceb78",
       "comment": "",
@@ -1133,7 +1133,7 @@
       "command": "assertText",
       "target": "css=div[role=\"tooltip\"]",
       "targets": [],
-      "value": "this tooltip is broken"
+      "value": "A brief description of the purpose of this filter."
     }, {
       "id": "3252a66e-f891-479e-8a6a-53460b3af55c",
       "comment": "",
@@ -1231,6 +1231,13 @@
       "target": "css=div[role=\"tooltip\"]",
       "targets": [],
       "value": "The precise behavior of any <MetadataFilter> element is controlled by the xsi:type attribute."
+    }, {
+      "id": "e4442dad-6000-49dd-96ca-85ea2a49e805",
+      "comment": "",
+      "command": "click",
+      "target": "css=body",
+      "targets": [],
+      "value": ""
     }, {
       "id": "6f9ae687-770a-4932-bdc9-a33706a698b7",
       "comment": "",
@@ -1277,9 +1284,9 @@
       "id": "583b61c9-b021-452b-b488-1faf2be311b6",
       "comment": "",
       "command": "mouseOver",
-      "target": "css=.row:nth-child(5) path:nth-child(1)",
+      "target": "css=.row:nth-child(6) .svg-inline--fa:nth-child(2)",
       "targets": [
-        ["css=.row:nth-child(5) path:nth-child(1)", "css:finder"]
+        ["css=.row:nth-child(6) .svg-inline--fa:nth-child(2)", "css:finder"]
       ],
       "value": ""
     }, {
@@ -1346,7 +1353,7 @@
       "command": "assertText",
       "target": "css=div[role=\"tooltip\"]",
       "targets": [],
-      "value": "Search Criteria by Entity ID"
+      "value": "The value used to search against, such as a regex pattern or entityID to match against."
     }, {
       "id": "6dc07848-bf6c-4468-8cb9-6434fb61098c",
       "comment": "",
@@ -1382,7 +1389,7 @@
       "command": "assertText",
       "target": "css=div[role=\"tooltip\"]",
       "targets": [],
-      "value": "Search Criteria by Regex"
+      "value": "The value used to search against, such as a regex pattern or entityID to match against."
     }, {
       "id": "0067cff3-9879-4a44-a6a1-70711255dc7c",
       "comment": "",
@@ -1418,7 +1425,7 @@
       "command": "assertText",
       "target": "css=div[role=\"tooltip\"]",
       "targets": [],
-      "value": "Search Criteria by Script"
+      "value": "The value used to search against, such as a regex pattern or entityID to match against."
     }, {
       "id": "cbfaac4f-35af-4014-b0a9-0748c9ae78f0",
       "comment": "",