move the hint expansion stuff to the search service as well, improve the so-called cheap highlighting