Make HighlightQuery class public