MDL-31989: Complleted work on highlighting query