Fix for org+loc selection.

If str_type is utf8, it creates a org_name which could contains "@"
which could lead to failures in org and loc selection.

Hence the fix to remove "@" char in org or loc.
Merge pull request #1530 from kbidarkar/replace-fix

Fix for org+loc selection.