Fix multiple filter and a busted test

Two filters with quotes in one query was broken.  Like:
boost-templates:"foo|1%" bar -intitle:"baz"

Also fix a busted test.

Change-Id: Ic66a5476230da32cb898e52e524960da9f924fb2