diff --git a/src/calibre/utils/search_query_parser.py b/src/calibre/utils/search_query_parser.py
index d74276ff9e..10d8b64a0d 100644
--- a/src/calibre/utils/search_query_parser.py
+++ b/src/calibre/utils/search_query_parser.py
@@ -129,7 +129,7 @@ class SearchQueryParser(object):
         self.optimize = optimize
         # Define a token
         self.standard_locations = locations
-        location     = Optional(Word(alphas+'#', bodyChars=alphanums)+Suppress(':'),
+        location     = Optional(Word(alphas+'#', bodyChars=alphanums+'_')+Suppress(':'),
                                 default='all')
         word_query   = CharsNotIn(string.whitespace + '()')
         #quoted_query = Suppress('"')+CharsNotIn('"')+Suppress('"')