Update headers
Fix encoding