Another fix to phrase query.

Almost all regressions removed.....

Change-Id: I3c053456ae09fb33cb6aef8c7c2749900ed24dbd