Fix hiliting of matched strings to better match the returned matched