Handle multiple matches on the same line; add highlighting