BLACKTIE-420 updated to make sure the match is for all the string, not just part of it