BLACKTIE-420 updated to make sure the match is for all the string, not j...

...ust part of it