diff --git a/module/kanban/js/common.js b/module/kanban/js/common.js
index b43b7235a7..a5710e8ed9 100644
--- a/module/kanban/js/common.js
+++ b/module/kanban/js/common.js
@@ -79,6 +79,9 @@ function setTargetLane(targetLaneID)
  */
 function locateView(module, objectID)
 {
-    var dataApp = module == 'productplan' || module == 'release' ? 'product' : 'execution';
+    var dataApp = 'kanban';
+    if(module == 'productplan' || module == 'release') dataApp = 'product';
+    if(module == 'execution') dataApp = 'execution';
+    if(module == 'build') dataApp = 'project';
     parent.$.apps.open(createLink(module, 'view', 'objectID=' + objectID), dataApp);
 }
diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js
index 7afcdeb042..bddc145cb2 100644
--- a/module/kanban/js/view.js
+++ b/module/kanban/js/view.js
@@ -591,7 +591,7 @@ function renderProductplanItem(item, $item)
     var begin      = $.zui.createDate(item.begin);
     var end        = $.zui.createDate(item.end);
     var today      = new Date();
-    var labelType  = begin.getTime() <= today.getTime() && end.getTime() >= today.getTime() ? 'danger' : 'wait';
+    var labelType  = (item.begin <= $.zui.formatDate(today, 'yyyy-MM-dd') && item.end >= $.zui.formatDate(today, 'yyyy-MM-dd')) ? 'danger' : 'wait';
     var labelTitle = $.zui.formatDate(begin, 'MM-dd') + ' ' + productplanLang.to + ' ' + $.zui.formatDate(end, 'MM-dd');
 
     if((item.begin == '2030-01-01' || item.end == '2030-01-01'))