Proper submatch highlighting