Fix multiple phrase queries in same search

We were merging all the phrase queries into a single one - this is obviously
wrong.

Change-Id: I9599bd20a9f48aabe60e9634ac4d13d8db02ddd2
Merge "Fix multiple phrase queries in same search"