fixed highlighting for queries with specific return fields