Merge "Fix highlighting for phrase queries"