Changed "org" to a facet, expanding the query only for highlighting.