diff --git a/app/modules/epics/related-userstories/related-userstories-create/related-userstories-create.controller.coffee b/app/modules/epics/related-userstories/related-userstories-create/related-userstories-create.controller.coffee
index 19c37a56..357271fb 100644
--- a/app/modules/epics/related-userstories/related-userstories-create/related-userstories-create.controller.coffee
+++ b/app/modules/epics/related-userstories/related-userstories-create/related-userstories-create.controller.coffee
@@ -37,10 +37,11 @@ class RelatedUserstoriesCreateController
             @.projects = @currentUserService.projects.get("all")
 
     filterUss: (selectedProjectId, filterText) ->
-        @rs.userstories.listInAllProjects({project: selectedProjectId, q: filterText}, true).then (data) =>
+        promise = @rs.userstories.listInAllProjects({project: selectedProjectId, q: filterText}, true).then (data) =>
             excludeIds = @.epicUserstories.map((us) -> us.get('id'))
             filteredData = data.filter((us) -> excludeIds.indexOf(us.get('id')) == -1)
             @.projectUserstories = filteredData
+        promise
 
     saveRelatedUserStory: (selectedUserstoryId, onSavedRelatedUserstory) ->
         # This method assumes the following methods are binded to the controller:
diff --git a/app/modules/epics/related-userstories/related-userstories-create/related-userstories-create.controller.spec.coffee b/app/modules/epics/related-userstories/related-userstories-create/related-userstories-create.controller.spec.coffee
index 3a1f6f74..1f5400fb 100644
--- a/app/modules/epics/related-userstories/related-userstories-create/related-userstories-create.controller.spec.coffee
+++ b/app/modules/epics/related-userstories/related-userstories-create/related-userstories-create.controller.spec.coffee
@@ -44,7 +44,7 @@ describe "RelatedUserstoriesCreate", ->
     _mockTgResources = () ->
         mocks.tgResources = {
             userstories: {
-                listAllInProject: sinon.stub()
+                listInAllProjects: sinon.stub()
             }
             epics: {
                 deleteRelatedUserstory: sinon.stub()
@@ -106,7 +106,7 @@ describe "RelatedUserstoriesCreate", ->
             }
         ])
 
-        promise = mocks.tgResources.userstories.listAllInProject.withArgs(1).promise().resolve(userstories)
+        promise = mocks.tgResources.userstories.listInAllProjects.withArgs({project:1, q:""}).promise().resolve(userstories)
         RelatedUserstoriesCreateCtrl.filterUss(1, "").then () ->
             expect(RelatedUserstoriesCreateCtrl.projectUserstories.toJS()).to.eql(filteredUserstories.toJS())
             done()
diff --git a/app/modules/epics/related-userstories/related-userstories-create/related-userstories-create.scss b/app/modules/epics/related-userstories/related-userstories-create/related-userstories-create.scss
index 4e8574bb..1ec221d9 100644
--- a/app/modules/epics/related-userstories/related-userstories-create/related-userstories-create.scss
+++ b/app/modules/epics/related-userstories/related-userstories-create/related-userstories-create.scss
@@ -52,7 +52,7 @@
         margin-bottom: 1rem;
     }
     .no-stories-found {
-        padding: 1rem 0 0 0;
+        padding: 1rem 0 0;
     }
     .new-user-story-options {
         display: flex;
diff --git a/gulpfile.js b/gulpfile.js
index 2bf9d1c9..7a89fdfa 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -707,7 +707,7 @@ gulp.task("express", function() {
         res.sendFile("index.html", {root: __dirname + "/dist/"});
     });
 
-    app.listen(9001);
+    app.listen(9002);
 });
 
 //Rerun the task when a file changes