Fixed issue #115 by no longer escaping locator strings. Other strings are still escaped.