diff --git a/app/coffee/modules/backlog/filters.coffee b/app/coffee/modules/backlog/filters.coffee
index 15229f5b..778cf011 100644
--- a/app/coffee/modules/backlog/filters.coffee
+++ b/app/coffee/modules/backlog/filters.coffee
@@ -130,15 +130,15 @@ BacklogFiltersDirective = ($log, $location) ->
 
             $ctrl.loadUserstories()
 
-        selectSubjectFilter = debounce 400, (value) ->
+        selectQFilter = debounce 400, (value) ->
             return if value is undefined
             if value.length == 0
-                $ctrl.replaceFilter("subject", null)
+                $ctrl.replaceFilter("q", null)
             else
-                $ctrl.replaceFilter("subject", value)
+                $ctrl.replaceFilter("q", value)
             $ctrl.loadUserstories()
 
-        $scope.$watch("filtersSubject", selectSubjectFilter)
+        $scope.$watch("filtersQ", selectQFilter)
 
         ## Angular Watchers
         $scope.$on "filters:loaded", (ctx, filters) ->
diff --git a/app/coffee/modules/backlog/main.coffee b/app/coffee/modules/backlog/main.coffee
index df838b4a..8b0dfc30 100644
--- a/app/coffee/modules/backlog/main.coffee
+++ b/app/coffee/modules/backlog/main.coffee
@@ -106,7 +106,7 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F
             selectedTags = _.filter(@scope.filters.tags, "selected")
             selectedStatuses = _.filter(@scope.filters.statuses, "selected")
 
-            @scope.filtersSubject = ""
+            @scope.filtersQ = ""
 
             _.forEach [selectedTags, selectedStatuses], (filterGrp) =>
                 _.forEach filterGrp, (item) =>
@@ -327,13 +327,13 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F
         return promise
 
     getUrlFilters: ->
-        return _.pick(@location.search(), "statuses", "tags", "subject")
+        return _.pick(@location.search(), "statuses", "tags", "q")
 
     generateFilters: ->
         urlfilters = @.getUrlFilters()
 
-        if urlfilters.subject
-            @scope.filtersSubject = urlfilters.subject
+        if urlfilters.q
+            @scope.filtersQ = urlfilters.q
 
         searchdata = {}
         for name, value of urlfilters
@@ -393,7 +393,7 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F
 
         @confirm.ask(title, subtitle).then =>
             # We modify the userstories in scope so the user doesn't see the removed US for a while
-            @scope.userstories = _.without(@scope.userstories, us);
+            @scope.userstories = _.without(@scope.userstories, us)
             @filterVisibleUserstories()
             @.repo.remove(us).then =>
                 @.loadBacklog()
@@ -559,7 +559,7 @@ BacklogDirective = ($repo, $rootscope) ->
 
         if filters.statuses ||
            filters.tags ||
-           filters.subject
+           filters.q
             showHideFilter($scope, $el, $ctrl)
 
         $scope.$on "$destroy", ->
diff --git a/app/coffee/modules/issues/list.coffee b/app/coffee/modules/issues/list.coffee
index fcd8ae1d..50cc6988 100644
--- a/app/coffee/modules/issues/list.coffee
+++ b/app/coffee/modules/issues/list.coffee
@@ -99,7 +99,7 @@ class IssuesController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi
 
     getUrlFilters: ->
         filters = _.pick(@location.search(), "page", "tags", "statuses", "types",
-                                             "subject", "severities", "priorities",
+                                             "q", "severities", "priorities",
                                              "assignedTo", "createdBy", "orderBy")
         filters.page = 1 if not filters.page
         return filters
@@ -127,7 +127,7 @@ class IssuesController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi
         currentSearch = @location.search()
         urlfilters = @.getUrlFilters()
         for filterName, filterValue of urlfilters
-            if filterName == "page" or filterName == "orderBy" or filterName == "subject"
+            if filterName == "page" or filterName == "orderBy" or filterName == "q"
                 continue
 
             if filterName == "tags"
@@ -165,8 +165,8 @@ class IssuesController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi
         deferred = @q.defer()
         urlfilters = @.getUrlFilters()
 
-        if urlfilters.subject
-            @scope.filtersSubject = urlfilters.subject
+        if urlfilters.q
+            @scope.filtersQ = urlfilters.q
 
         @.loadMyFilters().then (myFilters) =>
             @scope.filters.myFilters = myFilters
@@ -581,17 +581,17 @@ IssuesFiltersDirective = ($log, $location, $rs, $confirm) ->
         $scope.$on "filters:loaded", (ctx, filters) ->
             initializeSelectedFilters(filters)
 
-        selectSubjectFilter = debounce 400, (value) ->
+        selectQFilter = debounce 400, (value) ->
             return if value is undefined
             if value.length == 0
-                $ctrl.replaceFilter("subject", null)
+                $ctrl.replaceFilter("q", null)
                 $ctrl.storeFilters()
             else
-                $ctrl.replaceFilter("subject", value)
+                $ctrl.replaceFilter("q", value)
                 $ctrl.storeFilters()
             $ctrl.loadIssues()
 
-        $scope.$watch("filtersSubject", selectSubjectFilter)
+        $scope.$watch("filtersQ", selectQFilter)
 
         # Dom Event Handlers
         $el.on "click", ".filters-cats > ul > li > a", (event) ->
diff --git a/app/partials/views/modules/backlog-filters.jade b/app/partials/views/modules/backlog-filters.jade
index 6634fc6e..5ddd61a1 100644
--- a/app/partials/views/modules/backlog-filters.jade
+++ b/app/partials/views/modules/backlog-filters.jade
@@ -5,7 +5,7 @@ section.filters
 
         form
             fieldset
-                input(type="text", placeholder="Search by subject...", ng-model="filtersSubject")
+                input(type="text", placeholder="Search by subject or reference...", ng-model="filtersQ")
                 a.icon.icon-search(href="", title="search")
 
         div.filters-step-cat
diff --git a/app/partials/views/modules/filters.jade b/app/partials/views/modules/filters.jade
index a98fc35b..e55aff79 100644
--- a/app/partials/views/modules/filters.jade
+++ b/app/partials/views/modules/filters.jade
@@ -8,7 +8,7 @@ section.filters
 
         form
             fieldset
-                input(type="text", placeholder="Search by subject...", ng-model="filtersSubject")
+                input(type="text", placeholder="Search by subject or reference...", ng-model="filtersQ")
                 a.icon.icon-search(href="", title="search")
         h2
             a.hidden(href="", title="cat-name")
diff --git a/app/partials/views/modules/issues-filters.jade b/app/partials/views/modules/issues-filters.jade
index c0b89bc3..81873495 100644
--- a/app/partials/views/modules/issues-filters.jade
+++ b/app/partials/views/modules/issues-filters.jade
@@ -4,7 +4,7 @@ section.filters
             span.title filters
         form
             fieldset
-                input(type="text", placeholder="Search by subject...", ng-model="filtersSubject")
+                input(type="text", placeholder="Search by subject or reference...", ng-model="filtersQ")
                 a.icon.icon-search(href="", title="search")
         div.filters-step-cat
             div.filters-applied