diff --git a/mopidy/mpd/dispatcher.py b/mopidy/mpd/dispatcher.py
index 6aeace9d..0a916408 100644
--- a/mopidy/mpd/dispatcher.py
+++ b/mopidy/mpd/dispatcher.py
@@ -229,8 +229,8 @@ class MpdContext(object):
     #: The current :class:`mopidy.mpd.MpdSession`.
     session = None
 
-    #: The Mopidy configuration.
-    config = None
+    #: The MPD password
+    password = None
 
     #: The Mopidy core API. An instance of :class:`mopidy.core.Core`.
     core = None
@@ -246,7 +246,8 @@ class MpdContext(object):
     def __init__(self, dispatcher, session=None, config=None, core=None):
         self.dispatcher = dispatcher
         self.session = session
-        self.config = config
+        if config is not None:
+            self.password = config['mpd']['password']
         self.core = core
         self.events = set()
         self.subscriptions = set()
diff --git a/mopidy/mpd/protocol/connection.py b/mopidy/mpd/protocol/connection.py
index a6f9ffcb..41ee9e6a 100644
--- a/mopidy/mpd/protocol/connection.py
+++ b/mopidy/mpd/protocol/connection.py
@@ -39,7 +39,7 @@ def password(context, password):
         This is used for authentication with the server. ``PASSWORD`` is
         simply the plaintext password.
     """
-    if password == context.config['mpd']['password']:
+    if password == context.password:
         context.dispatcher.authenticated = True
     else:
         raise MpdPasswordError('incorrect password')
diff --git a/mopidy/mpd/protocol/music_db.py b/mopidy/mpd/protocol/music_db.py
index 58681557..e821af6b 100644
--- a/mopidy/mpd/protocol/music_db.py
+++ b/mopidy/mpd/protocol/music_db.py
@@ -62,30 +62,15 @@ SEARCH_QUERY = r"""
   $
 """
 
-# TODO Would be nice to get ("?)...\1 working for the quotes here
-SEARCH_PAIR_WITHOUT_GROUPS = r"""
+SEARCH_PAIR_WITH_GROUPS = r"""
+  ("?)                # Optional quote around the field type
   \b                  # Only begin matching at word bundaries
-  "?                  # Optional quote around the field type
-  (?:                 # A non-capturing group for the field type
+  (                   # A capturing group for the field type
 """ + SEARCH_FIELDS + """
   )
-  "?                  # End of optional quote around the field type
+  \\1                 # End of optional quote around the field type
   \                   # A single space
-  "[^"]+"             # Matching a quoted search string
-"""
-SEARCH_PAIR_WITHOUT_GROUPS_RE = re.compile(
-    SEARCH_PAIR_WITHOUT_GROUPS, flags=(re.UNICODE | re.VERBOSE))
-
-# TODO Would be nice to get ("?)...\1 working for the quotes here
-SEARCH_PAIR_WITH_GROUPS = r"""
-  \b                  # Only begin matching at word bundaries
-  "?                  # Optional quote around the field type
-  (?P<field>(         # A capturing group for the field type
-""" + SEARCH_FIELDS + """
-  ))
-  "?                  # End of optional quote around the field type
-  \                   # A single space
-  "(?P<what>[^"]+)"   # Capturing a quoted search string
+  "([^"]+)"           # Capturing a quoted search string
 """
 SEARCH_PAIR_WITH_GROUPS_RE = re.compile(
     SEARCH_PAIR_WITH_GROUPS, flags=(re.UNICODE | re.VERBOSE))
@@ -99,18 +84,18 @@ def _query_from_mpd_search_format(mpd_query):
     :param mpd_query: the MPD search query
     :type mpd_query: string
     """
-    pairs = SEARCH_PAIR_WITHOUT_GROUPS_RE.findall(mpd_query)
+    matches = SEARCH_PAIR_WITH_GROUPS_RE.findall(mpd_query)
     query = {}
-    for pair in pairs:
-        m = SEARCH_PAIR_WITH_GROUPS_RE.match(pair)
-        field = m.groupdict()['field'].lower()
+    # discard first field, which just captures optional quote
+    for _, field, what in matches:
+        field = field.lower()
         if field == 'title':
             field = 'track_name'
         elif field == 'track':
             field = 'track_no'
         elif field in ('file', 'filename'):
             field = 'uri'
-        what = m.groupdict()['what']
+
         if not what:
             raise ValueError
         if field in query:
diff --git a/tests/mpd/protocol/test_music_db.py b/tests/mpd/protocol/test_music_db.py
index 8d74fb95..bb36f3e2 100644
--- a/tests/mpd/protocol/test_music_db.py
+++ b/tests/mpd/protocol/test_music_db.py
@@ -12,7 +12,7 @@ from tests.mpd import protocol
 class QueryFromMpdSearchFormatTest(unittest.TestCase):
     def test_dates_are_extracted(self):
         result = music_db._query_from_mpd_search_format(
-            'Date "1974-01-02" Date "1975"')
+            'Date "1974-01-02" "Date" "1975"')
         self.assertEqual(result['date'][0], '1974-01-02')
         self.assertEqual(result['date'][1], '1975')