diff --git a/backend/src/integration/resources/SHIBUI-1335-2.side b/backend/src/integration/resources/SHIBUI-1335-2.side
index f74c372a9..abc25a75c 100644
--- a/backend/src/integration/resources/SHIBUI-1335-2.side
+++ b/backend/src/integration/resources/SHIBUI-1335-2.side
@@ -567,6 +567,13 @@
         ["xpath=//a[contains(.,'Add Filter')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "32c13864-5b11-4316-a27b-fd0042328924",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "094ce013-936c-4479-9c5b-ba26db4d05c9",
       "comment": "",
@@ -586,6 +593,13 @@
       "target": "name=type",
       "targets": [],
       "value": "label=NameIDFormat"
+    }, {
+      "id": "c2598572-19aa-49d9-b336-f486a73e2579",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "471c00e2-52d8-4cf7-a071-00b50c98bf9e",
       "comment": "",
@@ -606,6 +620,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Name ID Filter"
+    }, {
+      "id": "4cc11ab2-b8e3-4669-ad58-9c8e9664a8de",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "ec49b089-a390-4cff-904f-363d3a57cb76",
       "comment": "",
@@ -619,11 +640,18 @@
         ["xpath=//button[contains(.,'Entity ID')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "7f746a0d-6006-4749-aa61-56b08b48c4fd",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "56abaabc-0c96-428c-9070-62a79ba90c6c",
       "comment": "",
       "command": "click",
-      "target": "linkText=Entity ID",
+      "target": "css=.show > .dropdown-item:nth-child(1)",
       "targets": [
         ["linkText=Entity ID", "linkText"],
         ["css=.show > .dropdown-item:nth-child(1)", "css:finder"],
diff --git a/backend/src/integration/resources/SHIBUI-1364-2.side b/backend/src/integration/resources/SHIBUI-1364-2.side
index fa45e3121..4393ffcd8 100644
--- a/backend/src/integration/resources/SHIBUI-1364-2.side
+++ b/backend/src/integration/resources/SHIBUI-1364-2.side
@@ -548,6 +548,13 @@
         ["xpath=//a[contains(.,'Add Filter')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "eab53a0d-32e6-4cb1-844b-d5fae8106820",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "094ce013-936c-4479-9c5b-ba26db4d05c9",
       "comment": "",
@@ -567,6 +574,13 @@
       "target": "name=type",
       "targets": [],
       "value": "label=NameIDFormat"
+    }, {
+      "id": "85556730-f474-42bd-8c04-2620c8814202",
+      "comment": "",
+      "command": "pause",
+      "target": "2000",
+      "targets": [],
+      "value": ""
     }, {
       "id": "471c00e2-52d8-4cf7-a071-00b50c98bf9e",
       "comment": "",
diff --git a/gradle.properties b/gradle.properties
index 89278c126..2db3fb78d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ hibernate.version=5.2.11.Final
 
 lucene.version=7.2.1
 
-org.gradle.jvmargs=-Xmx8g
+org.gradle.jvmargs=-Xmx8g -XX:-UseGCOverheadLimit
 
 # set token in personal global
 i2.github.token=