improve escaping