Merchant Search is tokenizing '@' , '-' and '.' characters

If you are looking for a merchant in merchant search by email address and type, say, bob@foo-bar.com, I get any merchant that contains 'bob' , 'foo' , 'bar' or 'com' . We need to handle these symbols appropriately for merchant search.