Fix highlighting for overlapping matches