diff --git a/demo-shell/src/app/components/cloud/service-task-list-cloud-demo.component.html b/demo-shell/src/app/components/cloud/service-task-list-cloud-demo.component.html
index a60a0573fe..1436fe12e6 100644
--- a/demo-shell/src/app/components/cloud/service-task-list-cloud-demo.component.html
+++ b/demo-shell/src/app/components/cloud/service-task-list-cloud-demo.component.html
@@ -2,7 +2,8 @@
      fxFill>
     <adf-cloud-service-task-filters [appName]="appName"
                                     [filterParam]="{index: 0}"
-                                    (filterClick)="onTaskFilterSelected($event)">
+                                    (filterClicked)="onTaskFilterSelected($event)"
+                                    (filterSelected)="onTaskFilterSelected($event)">
 
     </adf-cloud-service-task-filters>
     <div fxLayout="column"
diff --git a/lib/process-services-cloud/src/lib/task/task-list/components/service-task-list-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-list/components/service-task-list-cloud.component.ts
index 1c69411c7d..9abee66b9b 100644
--- a/lib/process-services-cloud/src/lib/task/task-list/components/service-task-list-cloud.component.ts
+++ b/lib/process-services-cloud/src/lib/task/task-list/components/service-task-list-cloud.component.ts
@@ -64,21 +64,21 @@ export class ServiceTaskListCloudComponent extends BaseTaskListCloudComponent {
             maxItems: this.size,
             skipCount: this.skipCount,
             sorting: this.sorting,
-            id: this.queryParams.serviceTaskId,
-            activityName: this.queryParams.activityName,
-            activityType: this.queryParams.activityType,
-            completedDate: this.queryParams.completedDate,
-            elementId: this.queryParams.elementId,
-            executionId: this.queryParams.executionId,
-            processDefinitionId: this.queryParams.processDefinitionId,
-            processDefinitionKey: this.queryParams.processDefinitionKey,
-            processDefinitionVersion: this.queryParams.processDefinitionVersion,
-            processInstanceId: this.queryParams.processInstanceId,
-            serviceFullName: this.queryParams.serviceFullName,
-            serviceName: this.queryParams.serviceName,
-            serviceVersion: this.queryParams.serviceVersion,
-            startedDate: this.queryParams.startedDate,
-            status: this.queryParams.status
+            id: this.queryParams?.serviceTaskId,
+            activityName: this.queryParams?.activityName,
+            activityType: this.queryParams?.activityType,
+            completedDate: this.queryParams?.completedDate,
+            elementId: this.queryParams?.elementId,
+            executionId: this.queryParams?.executionId,
+            processDefinitionId: this.queryParams?.processDefinitionId,
+            processDefinitionKey: this.queryParams?.processDefinitionKey,
+            processDefinitionVersion: this.queryParams?.processDefinitionVersion,
+            processInstanceId: this.queryParams?.processInstanceId,
+            serviceFullName: this.queryParams?.serviceFullName,
+            serviceName: this.queryParams?.serviceName,
+            serviceVersion: this.queryParams?.serviceVersion,
+            startedDate: this.queryParams?.startedDate,
+            status: this.queryParams?.status
         } as ServiceTaskQueryCloudRequestModel;
         return requestNode;
     }