improve highlight of matches