diff --git a/lib/core/card-view/card-view.component.html b/lib/core/card-view/card-view.component.html
index b74f8d0d1c..afe045024f 100644
--- a/lib/core/card-view/card-view.component.html
+++ b/lib/core/card-view/card-view.component.html
@@ -1,7 +1,8 @@
 <div class="adf-property-list">
-    <ng-container *ngFor="let property of properties">
+    <div *ngFor="let property of properties">
         <div [attr.data-automation-id]="'header-'+property.key" class="adf-property">
             <adf-card-view-item-dispatcher [property]="property" [editable]="editable"></adf-card-view-item-dispatcher>
         </div>
-    </ng-container>
+    </div>
 </div>
+
diff --git a/lib/process-services/task-list/components/task-list.component.ts b/lib/process-services/task-list/components/task-list.component.ts
index 0afc1d39dd..a3affa5a95 100644
--- a/lib/process-services/task-list/components/task-list.component.ts
+++ b/lib/process-services/task-list/components/task-list.component.ts
@@ -231,11 +231,23 @@ export class TaskListComponent implements OnChanges, OnInit, AfterContentInit {
     /**
      * Select the task given in input if present
      */
-    selectTask(taskIdToSelect: string): void {
+    selectTask(taskIdSelected: string): void {
         if (!this.isListEmpty()) {
             let rows = this.data.getRows();
             if (rows.length > 0) {
-                let dataRow = rows.find(row => row.getValue('id') === taskIdToSelect) || rows[0];
+                let dataRow;
+                if (taskIdSelected) {
+                    dataRow = rows.find((currentRow: any) => {
+                        return currentRow.getValue('id') === taskIdSelected;
+                    });
+
+                    if (!dataRow) {
+                        dataRow = rows[0];
+                    }
+                } else {
+                    dataRow = rows[0];
+                }
+
                 this.data.selectedRow = dataRow;
                 dataRow.isSelected = true;
                 this.currentInstanceId = dataRow.getValue('id');
@@ -244,6 +256,7 @@ export class TaskListComponent implements OnChanges, OnInit, AfterContentInit {
             if (this.data) {
                 this.data.selectedRow = null;
             }
+
             this.currentInstanceId = null;
         }
     }
diff --git a/lib/process-services/task-list/services/tasklist.service.ts b/lib/process-services/task-list/services/tasklist.service.ts
index 790e7f3b61..66061ec257 100644
--- a/lib/process-services/task-list/services/tasklist.service.ts
+++ b/lib/process-services/task-list/services/tasklist.service.ts
@@ -24,6 +24,9 @@ import { Form } from '../models/form.model';
 import { TaskDetailsModel } from '../models/task-details.model';
 import { TaskListModel } from '../models/task-list.model';
 import 'rxjs/add/observable/throw';
+import 'rxjs/add/observable/forkJoin';
+import 'rxjs/add/observable/fromPromise';
+import 'rxjs/operator/switchMap';
 
 @Injectable()
 export class TaskListService {