Better highlighting of matches