diff --git a/app/coffee/modules/related-tasks.coffee b/app/coffee/modules/related-tasks.coffee
index 459d800b..0e51b881 100644
--- a/app/coffee/modules/related-tasks.coffee
+++ b/app/coffee/modules/related-tasks.coffee
@@ -229,7 +229,7 @@ RelatedTasksDirective = ($repo, $rs, $rootscope) ->
     link = ($scope, $el, $attrs) ->
         loadTasks = ->
             return $rs.tasks.list($scope.projectId, null, $scope.usId).then (tasks) =>
-                $scope.tasks = _.sortBy(tasks, 'ref')
+                $scope.tasks = _.sortBy(tasks, (x) => [x.us_order, x.ref])
                 return tasks
 
         _isVisible = ->
diff --git a/app/coffee/modules/taskboard/main.coffee b/app/coffee/modules/taskboard/main.coffee
index b66d6957..4cc01f7b 100644
--- a/app/coffee/modules/taskboard/main.coffee
+++ b/app/coffee/modules/taskboard/main.coffee
@@ -339,7 +339,6 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin, taiga
     loadTasks: ->
         params = {
             include_attachments: true,
-            include_tasks: true
         }
 
         params = _.merge params, @location.search()
@@ -401,7 +400,6 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin, taiga
         params = {
             status__is_archived: false,
             include_attachments: true,
-            include_tasks: true
         }
 
         options = {
diff --git a/app/coffee/modules/userstories/detail.coffee b/app/coffee/modules/userstories/detail.coffee
index 5f80cdaf..c19d4fdb 100644
--- a/app/coffee/modules/userstories/detail.coffee
+++ b/app/coffee/modules/userstories/detail.coffee
@@ -331,7 +331,7 @@ UsStatusButtonDirective = ($rootScope, $repo, $confirm, $loading, $modelTransfor
 
             $el.html(html)
 
-            $compile($el.contents())($scope);
+            $compile($el.contents())($scope)
 
         save = (status) =>
             $el.find(".pop-status").popover().close()