added escaping of strings