Highlighting: make HighlightQuery class public