Small bugfix for matching and highlighting