Tech highlighter to use rescore queries.

Closes #3630