fixed string escaping issues