Fix previous commit: highlight not removed when no match is found