Added Highlighting support to QueryBuilder