diff --git a/mopidy/core/tracklist.py b/mopidy/core/tracklist.py
index 9f7d40ee..002b0d0d 100644
--- a/mopidy/core/tracklist.py
+++ b/mopidy/core/tracklist.py
@@ -317,11 +317,13 @@ class TracklistController(object):
         criteria = criteria or kwargs
         matches = self._tl_tracks
         for (key, value) in criteria.iteritems():
+            if not type(value) is list:
+                value = [value]
             if key == 'tlid':
-                matches = filter(lambda ct: value in ct.tlid, matches)
+                matches = filter(lambda ct: ct.tlid in value, matches)
             else:
                 matches = filter(
-                    lambda ct: value in getattr(ct.track, key), matches)
+                    lambda ct: getattr(ct.track, key) in value, matches)
         return matches
 
     def move(self, start, end, to_position):