diff --git a/app/coffee/modules/backlog/main.coffee b/app/coffee/modules/backlog/main.coffee
index 2c17dbd3..bb320993 100644
--- a/app/coffee/modules/backlog/main.coffee
+++ b/app/coffee/modules/backlog/main.coffee
@@ -423,19 +423,7 @@ BacklogDirective = ($repo, $rootscope) ->
     """)
 
     linkDoomLine = ($scope, $el, $attrs, $ctrl) ->
-
-        removeDoomlineDom = ->
-            $el.find(".doom-line").remove()
-
-        addDoomLineDom = (element) ->
-            element?.before(doomLineTemplate({}))
-
-        getUsItems = ->
-            rowElements = $el.find('.backlog-table-body .us-item-row')
-            return _.map(rowElements, (x) -> angular.element(x))
-
-        # reloadDoomlineLocation = () ->
-        $scope.$watch "stats", (project) ->
+        reloadDoomLine = ->
             if $scope.stats?
                 removeDoomlineDom()
 
@@ -452,10 +440,23 @@ BacklogDirective = ($repo, $rootscope) ->
                         continue
 
                     current_sum += scope.us.total_points
+
                     if current_sum > total_points
                         addDoomLineDom(element)
                         break
 
+        removeDoomlineDom = ->
+            $el.find(".doom-line").remove()
+
+        addDoomLineDom = (element) ->
+            element?.before(doomLineTemplate({}))
+
+        getUsItems = ->
+            rowElements = $el.find('.backlog-table-body .us-item-row')
+            return _.map(rowElements, (x) -> angular.element(x))
+
+        $scope.$on("userstories:loaded", reloadDoomLine)
+        $scope.$watch "stats", reloadDoomLine
 
     ##############################
     ## Move to current sprint link
@@ -548,7 +549,7 @@ BacklogDirective = ($repo, $rootscope) ->
 
         linkToolbar($scope, $el, $attrs, $ctrl)
         linkFilters($scope, $el, $attrs, $ctrl)
-        # linkDoomLine($scope, $el, $attrs, $ctrl)
+        linkDoomLine($scope, $el, $attrs, $ctrl)
 
         $el.find(".backlog-table-body").disableSelection()
 
diff --git a/app/coffee/modules/resources/userstories.coffee b/app/coffee/modules/resources/userstories.coffee
index cdb252ba..11fa2e6c 100644
--- a/app/coffee/modules/resources/userstories.coffee
+++ b/app/coffee/modules/resources/userstories.coffee
@@ -33,7 +33,7 @@ resourceProvider = ($repo, $http, $urls, $storage) ->
         return $repo.queryOne("userstories", usId, params)
 
     service.listUnassigned = (projectId, filters) ->
-        params = {"project": projectId, "milestone": "null"}
+        params = {"project": projectId, "milestone": null}
         params = _.extend({}, params, filters or {})
         service.storeQueryParams(projectId, params)
         return $repo.queryMany("userstories", params)