diff --git a/e2e/process-services-cloud/process/process-custom-filters.e2e.ts b/e2e/process-services-cloud/process/process-custom-filters.e2e.ts
index cb95b79055..edc28bf94e 100644
--- a/e2e/process-services-cloud/process/process-custom-filters.e2e.ts
+++ b/e2e/process-services-cloud/process/process-custom-filters.e2e.ts
@@ -143,8 +143,9 @@ describe('Process list cloud', () => {
             await processCloudDemoPage.processFilterCloudComponent.clickOnProcessFilters();
         });
 
-        function setFilter(props: FilterProps): Promise<void> {
-            return editProcessFilter.setFilter(props);
+        async function setFilter(props: FilterProps): Promise<void> {
+            await editProcessFilter.setFilter(props);
+            await waitTillContentLoaded();
         }
 
         async function waitTillContentLoaded() {
@@ -152,64 +153,65 @@ describe('Process list cloud', () => {
         }
 
         it('[C290069] Should display processes ordered by name when Name is selected from sort dropdown', async () => {
-            await setFilter({ status: PROCESS_STATUS.RUNNING, sort: 'Name', order: SORT_DIRECTION.ASC });
-            await waitTillContentLoaded();
+            await setFilter({ status: PROCESS_STATUS.RUNNING });
+            await setFilter({ sort: 'Name' });
+            await setFilter({ order: SORT_DIRECTION.ASC });
 
             await expect(await processList.getDataTable().checkListIsSorted(SORT_DIRECTION.ASC, 'Name')).toBe(true);
 
             await setFilter({ order: SORT_DIRECTION.DESC});
-            await waitTillContentLoaded();
 
             await expect(await processList.getDataTable().checkListIsSorted(SORT_DIRECTION.DESC, 'Name')).toBe(true);
         });
 
         it('[C291783] Should display processes ordered by id when Id is selected from sort dropdown', async () => {
-            await setFilter({ status: PROCESS_STATUS.RUNNING, sort: 'Id', order: SORT_DIRECTION.ASC });
-            await waitTillContentLoaded();
+            await setFilter({ status: PROCESS_STATUS.RUNNING });
+            await setFilter({ sort: 'Id'});
+            await setFilter({ order: SORT_DIRECTION.ASC });
 
             await expect(await processList.getDataTable().checkListIsSorted(SORT_DIRECTION.ASC, 'Id')).toBe(true);
 
             await setFilter({ order: SORT_DIRECTION.DESC});
-            await waitTillContentLoaded();
             await expect(await processList.getDataTable().checkListIsSorted(SORT_DIRECTION.DESC, 'Id')).toBe(true);
         });
 
         it('[C305054] Should display processes ordered by status when Status is selected from sort dropdown', async () => {
-            await setFilter({ status: PROCESS_STATUS.ALL, sort: 'Status', order: SORT_DIRECTION.ASC });
-            await waitTillContentLoaded();
+            await setFilter({ status: PROCESS_STATUS.ALL });
+            await setFilter({ sort: 'Status' });
+            await setFilter({ order: SORT_DIRECTION.ASC });
 
             await expect(await processList.getDataTable().checkListIsSorted(SORT_DIRECTION.ASC, 'Status')).toBe(true);
 
             await setFilter({ order: SORT_DIRECTION.DESC});
-            await waitTillContentLoaded();
             await expect(await processList.getDataTable().checkListIsSorted(SORT_DIRECTION.DESC, 'Status')).toBe(true);
         });
 
         it('[C305054] Should display processes ordered by started by when Started By is selected from sort dropdown', async () => {
-            await setFilter({ status: PROCESS_STATUS.ALL, sort: 'Started by', order: SORT_DIRECTION.ASC });
-            await waitTillContentLoaded();
+            await setFilter({ status: PROCESS_STATUS.ALL });
+            await setFilter({ sort: 'Started by' });
+            await setFilter({ order: SORT_DIRECTION.ASC });
 
             await expect(await processList.getDataTable().checkListIsSorted(SORT_DIRECTION.ASC, 'Started by')).toBe(true);
 
             await setFilter({ order: SORT_DIRECTION.DESC});
-            await waitTillContentLoaded();
             await expect(await processList.getDataTable().checkListIsSorted(SORT_DIRECTION.DESC, 'Started by')).toBe(true);
         });
 
         it('[C305054] Should display processes ordered by processdefinitionid date when ProcessDefinitionId is selected from sort dropdown', async () => {
-            await setFilter({ status: PROCESS_STATUS.ALL, sort: 'ProcessDefinitionId', order: SORT_DIRECTION.ASC });
-            await waitTillContentLoaded();
+            await setFilter({ status: PROCESS_STATUS.ALL });
+            await setFilter({ sort: 'ProcessDefinitionId' });
+            await setFilter({ order: SORT_DIRECTION.ASC });
 
             await expect(await processList.getDataTable().checkListIsSorted(SORT_DIRECTION.ASC, 'Process Definition Id')).toBe(true);
 
             await setFilter({ order: SORT_DIRECTION.DESC});
-            await waitTillContentLoaded();
             await expect(await processList.getDataTable().checkListIsSorted(SORT_DIRECTION.DESC, 'Process Definition Id')).toBe(true);
         });
 
         it('[C305054] Should display processes ordered by processdefinitionkey date when ProcessDefinitionKey is selected from sort dropdown', async () => {
-            await setFilter({ status: PROCESS_STATUS.ALL, sort: 'ProcessDefinitionKey', order: SORT_DIRECTION.ASC });
-            await waitTillContentLoaded();
+            await setFilter({ status: PROCESS_STATUS.ALL });
+            await setFilter({ sort: 'ProcessDefinitionKey' });
+            await setFilter({ order: SORT_DIRECTION.ASC });
 
             await expect(await processList.getDataTable().checkListIsSorted(SORT_DIRECTION.ASC, 'Process Definition Key')).toBe(true);
 
@@ -218,24 +220,24 @@ describe('Process list cloud', () => {
         });
 
         it('[C305054] Should display processes ordered by last modified date when Last Modified is selected from sort dropdown', async () => {
-            await setFilter({ status: PROCESS_STATUS.ALL, sort: 'Last Modified', order: SORT_DIRECTION.ASC });
-            await waitTillContentLoaded();
+            await setFilter({ status: PROCESS_STATUS.ALL });
+            await setFilter({ sort: 'Last Modified' });
+            await setFilter({ order: SORT_DIRECTION.ASC });
 
             await expect(await processList.getDataTable().checkListIsSorted(SORT_DIRECTION.ASC, 'Last Modified')).toBe(true);
 
             await setFilter({ order: SORT_DIRECTION.DESC });
-            await waitTillContentLoaded();
             await expect(await processList.getDataTable().checkListIsSorted(SORT_DIRECTION.DESC, 'Last Modified')).toBe(true);
         });
 
         it('[C305054] Should display processes ordered by business key date when BusinessKey is selected from sort dropdown', async () => {
-            await setFilter({ status: PROCESS_STATUS.ALL, sort: 'Business Key', order: SORT_DIRECTION.ASC });
-            await waitTillContentLoaded();
+            await setFilter({ status: PROCESS_STATUS.ALL });
+            await setFilter({ sort: 'Business Key' });
+            await setFilter({ order: SORT_DIRECTION.ASC });
 
             await expect(await processList.getDataTable().checkListIsSorted(SORT_DIRECTION.ASC, 'Business Key')).toBe(true);
 
             await setFilter({ order: SORT_DIRECTION.DESC});
-            await waitTillContentLoaded();
             await expect(await processList.getDataTable().checkListIsSorted(SORT_DIRECTION.DESC, 'Business Key')).toBe(true);
         });
 
diff --git a/e2e/process-services-cloud/process/process-filter-results.e2e.ts b/e2e/process-services-cloud/process/process-filter-results.e2e.ts
index 865037035e..71a3532a3a 100644
--- a/e2e/process-services-cloud/process/process-filter-results.e2e.ts
+++ b/e2e/process-services-cloud/process/process-filter-results.e2e.ts
@@ -163,6 +163,7 @@ describe('Process filters cloud', () => {
     it('[C306887] Should be able to filter by appName', async () => {
         await editProcessFilter.openFilter();
         await editProcessFilter.setAppNameDropDown(candidateBaseApp);
+        await processList.getDataTable().waitTillContentLoaded();
         await editProcessFilter.setInitiator(`${testUser.firstName} ${testUser.lastName}`);
 
         await processList.getDataTable().waitTillContentLoaded();
@@ -200,10 +201,12 @@ describe('Process filters cloud', () => {
     it('[C311316] Should be able to filter by process definition key', async () => {
         await editProcessFilter.openFilter();
         await editProcessFilter.setProperty('processDefinitionKey', processDefinition.entry.key);
+        await processList.getDataTable().waitTillContentLoaded();
         await editProcessFilter.setProcessName(runningProcessInstance.entry.name);
         await processList.checkContentIsDisplayedByName(runningProcessInstance.entry.name);
 
         await editProcessFilter.setProcessName(anotherProcessInstance.entry.name);
+        await processList.getDataTable().waitTillContentLoaded();
         await editProcessFilter.setProperty('processDefinitionKey', anotherProcessDefinition.entry.key);
         await processList.checkContentIsDisplayedByName(anotherProcessInstance.entry.name);
         await processList.checkContentIsNotDisplayedByName(runningProcessInstance.entry.name);
@@ -239,6 +242,7 @@ describe('Process filters cloud', () => {
     it('[C306892] Should be able to filter by process status - Running', async () => {
         await editProcessFilter.openFilter();
         await editProcessFilter.setStatusFilterDropDown(PROCESS_STATUS.RUNNING);
+        await processList.getDataTable().waitTillContentLoaded();
         await editProcessFilter.setProcessName(runningProcessInstance.entry.name);
         await processList.checkContentIsDisplayedByName(runningProcessInstance.entry.name);
 
@@ -255,6 +259,7 @@ describe('Process filters cloud', () => {
     it('[C306892] Should be able to filter by process status - Completed', async () => {
         await editProcessFilter.openFilter();
         await editProcessFilter.setStatusFilterDropDown(PROCESS_STATUS.COMPLETED);
+        await processList.getDataTable().waitTillContentLoaded();
         await editProcessFilter.setProcessName(completedProcess.entry.name);
         await processList.checkContentIsDisplayedByName(completedProcess.entry.name);
 
@@ -271,6 +276,7 @@ describe('Process filters cloud', () => {
     it('[C306892] Should be able to filter by process status - Suspended', async () => {
         await editProcessFilter.openFilter();
         await editProcessFilter.setStatusFilterDropDown(PROCESS_STATUS.SUSPENDED);
+        await processList.getDataTable().waitTillContentLoaded();
         await editProcessFilter.setProcessName(suspendProcessInstance.entry.name);
         await processList.checkContentIsDisplayedByName(suspendProcessInstance.entry.name);
 
@@ -299,6 +305,7 @@ describe('Process filters cloud', () => {
     it('[C311318] Should be able to filter by lastModifiedFrom - displays record when date = currentDate', async () => {
         await editProcessFilter.openFilter();
         await editProcessFilter.setProperty('lastModifiedFrom', currentDate);
+        await processList.getDataTable().waitTillContentLoaded();
         await editProcessFilter.setProcessName(runningProcessInstance.entry.name);
         await processList.checkContentIsDisplayedByName(runningProcessInstance.entry.name);
     });
@@ -306,6 +313,7 @@ describe('Process filters cloud', () => {
     it('[C311318] Should be able to filter by lastModifiedFrom - displays record when date = beforeDate', async () => {
         await editProcessFilter.openFilter();
         await editProcessFilter.setProperty('lastModifiedFrom', beforeDate);
+        await processList.getDataTable().waitTillContentLoaded();
         await editProcessFilter.setProcessName(runningProcessInstance.entry.name);
         await processList.checkContentIsDisplayedByName(runningProcessInstance.entry.name);
     });
@@ -313,6 +321,7 @@ describe('Process filters cloud', () => {
     it('[C311318] Should be able to filter by lastModifiedFrom - does not display record when date = afterDate', async () => {
         await editProcessFilter.openFilter();
         await editProcessFilter.setProcessName(runningProcessInstance.entry.name);
+        await processList.getDataTable().waitTillContentLoaded();
         await editProcessFilter.setProperty('lastModifiedFrom', afterDate);
         await processList.checkContentIsNotDisplayedByName(runningProcessInstance.entry.name);
     });
@@ -320,6 +329,7 @@ describe('Process filters cloud', () => {
     it('[C311319] Should be able to filter by lastModifiedTo - displays record when date = currentDate', async () => {
         await editProcessFilter.openFilter();
         await editProcessFilter.setProperty('lastModifiedTo', currentDate);
+        await processList.getDataTable().waitTillContentLoaded();
         await editProcessFilter.setProcessName(runningProcessInstance.entry.name);
         await processList.checkContentIsDisplayedByName(runningProcessInstance.entry.name);
     });
@@ -327,6 +337,7 @@ describe('Process filters cloud', () => {
     it('[C311319] Should be able to filter by lastModifiedTo - does not display record when date = beforeDate', async () => {
         await editProcessFilter.openFilter();
         await editProcessFilter.setProperty('lastModifiedTo', beforeDate);
+        await processList.getDataTable().waitTillContentLoaded();
         await editProcessFilter.setProcessName(runningProcessInstance.entry.name);
         await processList.checkContentIsNotDisplayedByName(runningProcessInstance.entry.name);
     });
@@ -334,6 +345,7 @@ describe('Process filters cloud', () => {
     it('[C311319] Should be able to filter by lastModifiedTo - displays record when date = afterDate', async () => {
         await editProcessFilter.openFilter();
         await editProcessFilter.setProperty('lastModifiedTo', afterDate);
+        await processList.getDataTable().waitTillContentLoaded();
         await editProcessFilter.setProcessName(runningProcessInstance.entry.name);
         await processList.checkContentIsDisplayedByName(runningProcessInstance.entry.name);
     });
@@ -341,6 +353,7 @@ describe('Process filters cloud', () => {
     it('[C311319] Should not display any processes when the lastModifiedFrom and lastModifiedTo are set to a future date', async () => {
         await editProcessFilter.openFilter();
         await editProcessFilter.setProperty('lastModifiedFrom', afterDate);
+        await processList.getDataTable().waitTillContentLoaded();
         await editProcessFilter.setProperty('lastModifiedTo', afterDate);
         await expect(await processListPage.getDisplayedProcessListTitle()).toEqual('No Processes Found');
     });
diff --git a/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts
index a6cd05aeac..29e5a8df40 100644
--- a/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts
+++ b/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts
@@ -82,8 +82,8 @@ export class EditProcessFilterCloudComponentPage {
         return BrowserActions.getText(element(by.css("mat-form-field[data-automation-id='status'] span")));
     }
 
-    setSortFilterDropDown(option): Promise<void> {
-        return this.sortDropdown.selectDropdownOption(option);
+    async setSortFilterDropDown(option): Promise<void> {
+        await this.sortDropdown.selectDropdownOption(option);
     }
 
     async getSortFilterDropDownValue(): Promise<string> {