Fix highlighting when multiple matches