diff --git a/module/execution/control.php b/module/execution/control.php
index e6d81595fa..cc1424096b 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -3078,8 +3078,7 @@ class execution extends control
         $this->view->product     = $product;
         $this->view->branches    = $product->type == 'normal' ? array() : $this->loadModel('branch')->getPairs($product->id);
         $this->view->plan        = $this->dao->findById($story->plan)->from(TABLE_PRODUCTPLAN)->fields('title')->fetch('title');
-        $this->view->bugs        = $this->dao->select('id,title')->from(TABLE_BUG)->where('story')->eq($storyID)->andWhere('deleted')->eq(0)->fetchAll();
-        $this->view->fromBug     = $this->dao->select('id,title')->from(TABLE_BUG)->where('toStory')->eq($storyID)->fetch();
+        $this->view->bugs        = $this->dao->select('id,title,status')->from(TABLE_BUG)->where('story')->eq($storyID)->andWhere('deleted')->eq(0)->fetchAll();
         $this->view->cases       = $this->dao->select('id,title')->from(TABLE_CASE)->where('story')->eq($storyID)->andWhere('deleted')->eq(0)->fetchAll();
         $this->view->modulePath  = $this->loadModel('tree')->getParents($story->module);
         $this->view->users       = $this->loadModel('user')->getPairs('noletter');
diff --git a/module/execution/ui/treestory.html.php b/module/execution/ui/treestory.html.php
index 06b18f4dec..7ec41a3c72 100644
--- a/module/execution/ui/treestory.html.php
+++ b/module/execution/ui/treestory.html.php
@@ -326,12 +326,12 @@ div
                         array_values(array_map(function($bug) use($lang)
                         {
                             return h::li
-                                (
-                                    set::title($bug->title),
-                                    label(setClass('circle size-sm'), $bug->id),
-                                    common::hasPriv('bug', 'view') ? a(set::href(helper::createLink('bug', 'view', "bugID=$bug->id")), setClass('title'), set('data-toggle', 'modal'), set::title($bug->title), $bug->title) : span(setClass('title'), $bug->title),
-                                    label(setClass("status-{$bug->status} size-sm"), $lang->bug->statusList[$bug->status])
-                                );
+                            (
+                                set::title($bug->title),
+                                label(setClass('circle size-sm'), $bug->id),
+                                common::hasPriv('bug', 'view') ? a(set::href(helper::createLink('bug', 'view', "bugID=$bug->id")), setClass('title'), set('data-toggle', 'modal'), set::title($bug->title), $bug->title) : span(setClass('title'), $bug->title),
+                                label(setClass("status-{$bug->status} size-sm ml-1"), $lang->bug->statusList[$bug->status])
+                            );
                         }, $bugs))
                     )
                 ) : null,
diff --git a/module/execution/ui/treetask.html.php b/module/execution/ui/treetask.html.php
index 6c2b25e92e..0355efdc31 100644
--- a/module/execution/ui/treetask.html.php
+++ b/module/execution/ui/treetask.html.php
@@ -21,12 +21,17 @@ div
             setClass('flex-none rounded-full gray-outline'),
             $task->id
         ),
-        $task->parent > 0 ?  label
+        $task->isParent ? label
+        (
+            setClass('flex-none rounded-full dark-outline ml-2'),
+            $this->lang->task->parentAB
+        ) : null,
+        $task->parent > 0 && !$task->isParent ? label
         (
             setClass('flex-none rounded-full dark-outline ml-2'),
             $this->lang->task->childrenAB
         ) : null,
-        !empty($task->mode) ?  label
+        !empty($task->mode) ? label
         (
             setClass('flex-none rounded-full dark-outline ml-2'),
             $this->lang->task->multipleAB