Allow quoted phrases in queries.

If the user screws up the quoting then do our best to fix it for them.

Change-Id: Ie863a0aebe4882e673dc7b46f8f9bbd8728f6609