Add highlights to query