Even better highlighting

It's now more likely to match whole words
Match only the last occurrence