diff --git a/app/modules/user-timeline/user-timeline-item/user-timeline-item-type.service.coffee b/app/modules/user-timeline/user-timeline-item/user-timeline-item-type.service.coffee
index 56fa4941..68b330cb 100644
--- a/app/modules/user-timeline/user-timeline-item/user-timeline-item-type.service.coffee
+++ b/app/modules/user-timeline/user-timeline-item/user-timeline-item-type.service.coffee
@@ -219,7 +219,7 @@ timelineType = (timeline, event) ->
             check: (timeline, event) ->
                 return event.obj == 'task' &&
                     event.type == 'change' &&
-                    !timeline.getIn('data', 'task', 'userstory') &&
+                    !timeline.getIn(['data', 'task', 'userstory']) &&
                     timeline.hasIn(['data', 'value_diff']) &&
                     timeline.getIn(['data', 'value_diff', 'key']) == 'description_diff'
             key: 'TIMELINE.TASK_UPDATED',
@@ -229,7 +229,7 @@ timelineType = (timeline, event) ->
             check: (timeline, event) ->
                 return event.obj == 'task' &&
                     event.type == 'change' &&
-                    timeline.getIn('data', 'task', 'userstory') &&
+                    timeline.getIn(['data', 'task', 'userstory']) &&
                     timeline.hasIn(['data', 'value_diff']) &&
                     timeline.getIn(['data', 'value_diff', 'key']) == 'description_diff'
             key: 'TIMELINE.TASK_UPDATED_WITH_US',
diff --git a/app/partials/includes/modules/taskboard-table.jade b/app/partials/includes/modules/taskboard-table.jade
index de30e250..5559f648 100644
--- a/app/partials/includes/modules/taskboard-table.jade
+++ b/app/partials/includes/modules/taskboard-table.jade
@@ -49,12 +49,11 @@ div.taskboard-table(tg-taskboard-squish-column)
                 div.taskboard-tasks-box.task-column(ng-repeat="st in taskStatusList track by st.id", tg-taskboard-sortable, class="squish-status-{{st.id}}", ng-class="{'column-fold':statusesFolded[st.id]}", tg-bind-scope)
                     div.taskboard-task(
                         ng-repeat="task in usTasks[null][st.id] track by task.id"
-                        tg-taskboard-task
                         tg-bind-scope
                         tg-class-permission="{'readonly': '!modify_task'}"
                         ng-class="{'card-placeholder': task.isPlaceholder}"
                     )
-                        div(ng-if="!task.isPlaceholder")
+                        div(ng-if="!task.isPlaceholder", tg-taskboard-task)
                             include ../components/taskboard-task
 
                         div(ng-if="task.isPlaceholder")