improved highlighting of the text match, add empty results markup