diff --git a/src/app/components_ngrx/planner-card/planner-card.component.html b/src/app/components_ngrx/planner-card/planner-card.component.html
index 2b8f5a678..74cd0b9d0 100644
--- a/src/app/components_ngrx/planner-card/planner-card.component.html
+++ b/src/app/components_ngrx/planner-card/planner-card.component.html
@@ -3,7 +3,7 @@
     <ng-template #cardHeader>
       <div class="f8-custom-card-header">
         <div class="wi-type-icon-wrapper">
-          <span class="fa fa-bullseye"></span>
+          <span class="{{workItem.type?.icon}}"></span>
         </div>
         <div class="title-wrapper" (click)="titleClick(workItem, $event);">
           <span>{{ workItem.number }}: </span>
diff --git a/src/app/effects/work-item-utils.ts b/src/app/effects/work-item-utils.ts
index a3ed42dbb..4a9e5d8ec 100644
--- a/src/app/effects/work-item-utils.ts
+++ b/src/app/effects/work-item-utils.ts
@@ -3,7 +3,7 @@ import { WorkItemUI } from '../models/work-item';
 
 export function workitemMatchesFilter(route, filterService, workItemService, workitem): Observable<WorkItemUI> {
   const currentRoute = route.queryParams;
-  if (currentRoute['boardContextId'] && currentRoute.hasOwnProperty('boardContextId')) {
+  if (currentRoute['q'].includes('boardContextId')) {
     return Observable.of(workitem);
   }
   if (Object.keys(currentRoute).length === 0 && currentRoute.constructor === Object) {