diff --git a/compiled/computed/filtered-query.js b/compiled/computed/filtered-query.js
index <HASH>..<HASH> 100644
--- a/compiled/computed/filtered-query.js
+++ b/compiled/computed/filtered-query.js
@@ -10,7 +10,7 @@ module.exports = function () {
   var result = {};
 
   for (var key in this.query) {
-    if (this.query[key] !== '') {
+    if (this.query[key] !== '' && this.filterable(key)) {
       result[key] = this.query[key];
     }
   }
diff --git a/lib/computed/filtered-query.js b/lib/computed/filtered-query.js
index <HASH>..<HASH> 100644
--- a/lib/computed/filtered-query.js
+++ b/lib/computed/filtered-query.js
@@ -3,15 +3,15 @@ module.exports = function() {
     if (typeof this.query!=='object' || this.opts.sendEmptyFilters) {
         return this.query;
       }
-    
+
     var result = {};
 
     for (var key in this.query) {
-        if (this.query[key]!=='') {
+        if (this.query[key]!=='' && this.filterable(key)) {
             result[key] = this.query[key];
         }
     }
 
     return result;
 
-}
\ No newline at end of file
+}
remove non-filterable columns from query (#<I>)