diff --git a/e2e/process-services/attach-file-content-service.e2e.ts b/e2e/process-services/attach-file-content-service.e2e.ts
index a109926a9a..c8b914d4be 100644
--- a/e2e/process-services/attach-file-content-service.e2e.ts
+++ b/e2e/process-services/attach-file-content-service.e2e.ts
@@ -112,9 +112,8 @@ describe('Attach File - Content service', () => {
         await widget.attachFileWidget().checkFileIsAttached(app.UPLOAD_FILE_FORM_CS.FIELD.widget_id, pdfFileOne.name);
 
         await widget.attachFileWidget().clickUploadButton(app.UPLOAD_FILE_FORM_CS.FIELD.widget_id);
-
         await widget.attachFileWidget().selectUploadSource(csIntegrations[0]);
-        await contentNodeSelector.checkDialogIsDisplayed();
+
         await contentNodeSelector.searchAndSelectResult(pdfFileTwo.name, pdfFileTwo.name);
         await contentNodeSelector.clickMoveCopyButton();
         await widget.attachFileWidget().checkFileIsAttached(app.UPLOAD_FILE_FORM_CS.FIELD.widget_id, pdfFileTwo.name);
@@ -146,7 +145,6 @@ describe('Attach File - Content service', () => {
         await expect(await externalNodeSelector.getTitle()).toEqual(`Sign into '${browser.params.testConfig.adf_external_acs.host}'`);
         await externalNodeSelector.login(user.email, user.password);
 
-        await externalNodeSelector.checkDialogIsDisplayed();
         await externalNodeSelector.searchAndSelectResult(externalFile, externalFile);
         await externalNodeSelector.clickMoveCopyButton();
         await widget.attachFileWidget().checkFileIsAttached(app.UPLOAD_FILE_FORM_CS.FIELD.widget_id, externalFile);
@@ -161,7 +159,6 @@ describe('Attach File - Content service', () => {
         await widget.attachFileWidget().clickUploadButton(app.UPLOAD_FILE_FORM_CS.FIELD.widget_id);
         await widget.attachFileWidget().selectUploadSource(csIntegrations[0]);
 
-        await contentNodeSelector.checkDialogIsDisplayed();
         await contentNodeSelector.searchAndSelectResult(pdfFileTwo.name, pdfFileTwo.name);
         await contentNodeSelector.clickMoveCopyButton();
 
@@ -178,7 +175,6 @@ describe('Attach File - Content service', () => {
         await expect(await externalNodeSelector.getTitle()).toEqual(`Sign into '${browser.params.testConfig.adf_external_acs.host}'`);
         await externalNodeSelector.login(user.email, user.password);
 
-        await externalNodeSelector.checkDialogIsDisplayed();
         await externalNodeSelector.searchAndSelectResult(externalFile, externalFile);
         await externalNodeSelector.clickMoveCopyButton();
         await widget.attachFileWidget().checkFileIsAttached(app.UPLOAD_FILE_FORM_CS.FIELD.widget_id, externalFile);
diff --git a/e2e/process-services/attach-folder.e2e.ts b/e2e/process-services/attach-folder.e2e.ts
index 8247ebc942..05a8927224 100644
--- a/e2e/process-services/attach-folder.e2e.ts
+++ b/e2e/process-services/attach-folder.e2e.ts
@@ -77,8 +77,6 @@ describe('Attach Folder', () => {
         const contentFileWidget = widget.attachFolderWidget();
         await contentFileWidget.clickWidget(app.UPLOAD_FOLDER_FORM_CS.FIELD.widget_id);
 
-        await contentNodeSelector.checkDialogIsDisplayed();
-
         await contentNodeSelector.searchAndSelectResult(user.email, user.email);
         await expect(await contentNodeSelector.checkCancelButtonIsEnabled()).toBe(true);
         await expect(await contentNodeSelector.checkCopyMoveButtonIsEnabled()).toBe(true);
diff --git a/e2e/process-services/process-list-component.e2e.ts b/e2e/process-services/process-list-component.e2e.ts
index f036af3bdf..212ea34570 100644
--- a/e2e/process-services/process-list-component.e2e.ts
+++ b/e2e/process-services/process-list-component.e2e.ts
@@ -119,6 +119,7 @@ describe('Process List Test', () => {
         await processListDemoPage.checkNoProcessFoundIsDisplayed();
 
         await processListDemoPage.addAppId(appWithDateFieldId);
+        await processListDemoPage.dataTable.waitTillContentLoaded();
 
         await processListDemoPage.checkProcessIsDisplayed(processName.procWithDate);
         await processListDemoPage.checkProcessIsDisplayed(processName.completedProcWithDate);
@@ -129,6 +130,7 @@ describe('Process List Test', () => {
 
     it('[C282015] Should be able to filter by Process Definition ID', async () => {
         await processListDemoPage.addProcessDefinitionId(procWithDate.processDefinitionId);
+        await processListDemoPage.dataTable.waitTillContentLoaded();
 
         await processListDemoPage.checkProcessIsDisplayed(processName.procWithDate);
         await processListDemoPage.checkProcessIsDisplayed(processName.completedProcWithDate);
@@ -139,6 +141,7 @@ describe('Process List Test', () => {
 
     it('[C282016] Should be able to filter by Process Instance ID', async () => {
         await processListDemoPage.addProcessInstanceId(procWithDate.id);
+        await processListDemoPage.dataTable.waitTillContentLoaded();
 
         await processListDemoPage.checkProcessIsDisplayed(processName.procWithDate);
 
@@ -149,6 +152,7 @@ describe('Process List Test', () => {
 
     it('[C282017] Should be able to filter by Status', async () => {
         await processListDemoPage.selectStateFilter('Active');
+        await processListDemoPage.dataTable.waitTillContentLoaded();
 
         await processListDemoPage.checkProcessIsNotDisplayed(processName.completedProcWithDate);
         await processListDemoPage.checkProcessIsNotDisplayed(processName.completedProcWithUserWidget);
@@ -165,6 +169,7 @@ describe('Process List Test', () => {
         await processListDemoPage.checkProcessIsNotDisplayed(processName.procWithUserWidget);
 
         await processListDemoPage.selectStateFilter('All');
+        await processListDemoPage.dataTable.waitTillContentLoaded();
 
         await processListDemoPage.checkProcessIsDisplayed(processName.completedProcWithDate);
         await processListDemoPage.checkProcessIsDisplayed(processName.completedProcWithUserWidget);
@@ -174,6 +179,7 @@ describe('Process List Test', () => {
 
     it('[C282010] Should be able to sort by creation date', async () => {
         await processListDemoPage.selectSorting('asc');
+        await processListDemoPage.dataTable.waitTillContentLoaded();
 
         const sortedProcessListNamesAsc = await processListDemoPage.getDisplayedProcessesNames();
 
diff --git a/e2e/protractor.excludes.json b/e2e/protractor.excludes.json
index e699532577..5ac4d9b881 100644
--- a/e2e/protractor.excludes.json
+++ b/e2e/protractor.excludes.json
@@ -1,5 +1,4 @@
 {
   "C260249" : "REPO-4772 ACS 6.2",
-  "C315268" : "https://issues.alfresco.com/jira/browse/ADF-5123"
 }
 
diff --git a/lib/testing/src/lib/content-services/dialog/content-node-selector-dialog.page.ts b/lib/testing/src/lib/content-services/dialog/content-node-selector-dialog.page.ts
index 619049460e..08c068bc5c 100644
--- a/lib/testing/src/lib/content-services/dialog/content-node-selector-dialog.page.ts
+++ b/lib/testing/src/lib/content-services/dialog/content-node-selector-dialog.page.ts
@@ -131,6 +131,11 @@ export class ContentNodeSelectorDialogPage {
 
     async searchAndSelectResult(searchText: string, name: string) {
         await this.typeIntoNodeSelectorSearchField(searchText);
+        try {
+            await this.contentListPage().dataTablePage().checkRowContentIsDisplayed(name);
+        } catch (e) {
+            console.error(`failed to get search result :: ${name}`);
+        }
         await this.clickContentNodeSelectorResult(name);
     }