Error non-escaping and DATA body variable fix