diff --git a/scripts/cypress-v2/integration/spec/roleValidation.spec.js b/scripts/cypress-v2/integration/spec/roleValidation.spec.js
index 2a8cb0498c..77ca3a3078 100644
--- a/scripts/cypress-v2/integration/spec/roleValidation.spec.js
+++ b/scripts/cypress-v2/integration/spec/roleValidation.spec.js
@@ -10,8 +10,13 @@ export function _advSettings(roleType, mode) {
     cy.log(roleType, mode);
 
     if(mode === 'baseShare') {
+
+        // open modal
         cy.get('.nc-project-menu').should('exist').click()
         cy.getActiveMenu().find(`[data-menu-id="language"]`).should('exist')
+
+        // click again to close modal
+        cy.get('.nc-project-menu').should('exist').click()
         return;
     }
 
diff --git a/scripts/cypress-v2/support/commands.js b/scripts/cypress-v2/support/commands.js
index fa2e64ed59..32e6da9fc6 100644
--- a/scripts/cypress-v2/support/commands.js
+++ b/scripts/cypress-v2/support/commands.js
@@ -378,14 +378,9 @@ Cypress.Commands.add("createColumn", (table, columnName) => {
 });
 
 Cypress.Commands.add("toastWait", (msg) => {
+    cy.get('.ant-message-notice-content:visible', { timout: 30000 }).should('exist')
     cy.get('.ant-message-notice-content:visible', { timout: 12000 }).contains(msg).should('exist')
     cy.get('.ant-message-notice-content:visible', { timout: 12000 }).should('not.exist')
-
-    // cy.get(".toasted:visible", { timout: 12000 }).contains(msg).should("exist");
-    // cy.get(".toasted:visible", { timout: 12000 })
-    //     .contains(msg)
-    //     .should("not.exist");
-    // cy.wait(3000);
 });
 
 // vn: view name
diff --git a/scripts/cypress-v2/support/page_objects/projectConstants.js b/scripts/cypress-v2/support/page_objects/projectConstants.js
index bbdc6b05b8..3973378f12 100644
--- a/scripts/cypress-v2/support/page_objects/projectConstants.js
+++ b/scripts/cypress-v2/support/page_objects/projectConstants.js
@@ -113,7 +113,7 @@ export const staticProjects = {
         config: defaultDbParams,
     },
     pgExternalREST: {
-        basic: { dbType: "external", apiType: "REST", name: "pgExternalREST" },
+        basic: { dbType: "external", apiType: "REST", name: "pgExtREST" },
         config: defaultPgDbParams,
     },
     pgExternalGQL: {