diff --git a/app/coffee/modules/backlog/main.coffee b/app/coffee/modules/backlog/main.coffee
index 493a5e6b..e9266d83 100644
--- a/app/coffee/modules/backlog/main.coffee
+++ b/app/coffee/modules/backlog/main.coffee
@@ -20,10 +20,13 @@
 ###
 
 taiga = @.taiga
+
 mixOf = @.taiga.mixOf
 toggleText = @.taiga.toggleText
 scopeDefer = @.taiga.scopeDefer
 bindOnce = @.taiga.bindOnce
+groupBy = @.taiga.groupBy
+
 
 class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin)
     constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q) ->
@@ -77,15 +80,9 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin)
         return @rs.projects.get(@scope.projectId).then (project) =>
             @scope.project = project
             @scope.points = _.sortBy(project.points, "order")
-            @scope.pointsById = {}
-            for p in @scope.points
-                @scope.pointsById[p.id] = p
-
-            @scope.usStatusById = {}
-            for s in project.us_statuses
-                @scope.usStatusById[s.id] = s
-
-            @scope.statusList = _.sortBy(project.us_statuses, "id")
+            @scope.pointsById = groupBy(project.points, (x) -> x.id)
+            @scope.usStatusById = groupBy(project.us_statuses, (x) -> x.id)
+            @scope.usStatusList = _.sortBy(project.us_statuses, "id")
             return project
 
     loadInitialData: ->
diff --git a/app/partials/views/modules/lightbox_add-new-us.jade b/app/partials/views/modules/lightbox_add-new-us.jade
index 6b1acd2e..d2b054b7 100644
--- a/app/partials/views/modules/lightbox_add-new-us.jade
+++ b/app/partials/views/modules/lightbox_add-new-us.jade
@@ -5,7 +5,7 @@ form
     fieldset
         input(type="text", ng-model="us.subject", tg-i18n="placeholder:common.subject", data-required="true")
     fieldset
-        select(ng-model="us.status", ng-options="s.id as s.name for s in statusList",
+        select(ng-model="us.status", ng-options="s.id as s.name for s in usStatusList",
                tg-i18n="placeholder:common.status")
     fieldset
         input(type="text", placeholder="Tags", tg-tags, ng-model="us.tags")