Improve escaping special chars