Now correctly escaping query bodies