diff --git a/mopidy/mpd/frontend.py b/mopidy/mpd/frontend.py
index cc70b938..51d1269e 100644
--- a/mopidy/mpd/frontend.py
+++ b/mopidy/mpd/frontend.py
@@ -113,7 +113,8 @@ class MpdFrontend(object):
         Parses a mpd query string and converts the MPD query to a list of
         (field, what) tuples.
         """
-        query_pattern = r'"?(?:[Aa]lbum|[Aa]rtist|[Ff]ilename|[Tt]itle|[Aa]ny)"? "[^"]+"'
+        query_pattern = (
+            r'"?(?:[Aa]lbum|[Aa]rtist|[Ff]ilename|[Tt]itle|[Aa]ny)"? "[^"]+"')
         query_parts = re.findall(query_pattern, mpd_query)
         query_part_pattern = (
             r'"?(?P<field>([Aa]lbum|[Aa]rtist|[Ff]ilename|[Tt]itle|[Aa]ny))"?\s'
@@ -122,8 +123,8 @@ class MpdFrontend(object):
         for query_part in query_parts:
             m = re.match(query_part_pattern, query_part)
             field = m.groupdict()['field'].lower()
-            if field == u'title':
-                field = u'track'
+            if field == 'title':
+                field = 'track'
             what = m.groupdict()['what'].lower()
             if field in query:
                 query[field].append(what)