diff --git a/beets/dbcore/query.py b/beets/dbcore/query.py
index 2d20f9e0f..f5d670956 100644
--- a/beets/dbcore/query.py
+++ b/beets/dbcore/query.py
@@ -132,8 +132,8 @@ class BooleanQuery(MatchQuery):
     """Matches a boolean field. Pattern should either be a boolean or a
     string reflecting a boolean.
     """
-    def __init__(self, field, pattern):
-        super(BooleanQuery, self).__init__(field, pattern)
+    def __init__(self, field, pattern, fast=True):
+        super(BooleanQuery, self).__init__(field, pattern, fast)
         if isinstance(pattern, basestring):
             self.pattern = util.str2bool(pattern)
         self.pattern = int(self.pattern)
diff --git a/beets/library.py b/beets/library.py
index 41e25984e..e91d7676d 100644
--- a/beets/library.py
+++ b/beets/library.py
@@ -828,12 +828,8 @@ def construct_query_part(query_part, model_cls):
 
     key = key.lower()
 
-    # A boolean field.
-    if key.lower() == 'comp':
-        return dbcore.query.BooleanQuery(key, pattern)
-
     # Singleton query (not a real field).
-    elif key == 'singleton':
+    if key == 'singleton':
         return SingletonQuery(util.str2bool(pattern))
 
     # Other field.