Can we change the selector to use ~ instead of *? 

Stops that text being found within other words. Had a bug on CF which raised this.