improved
Fixed Encoding and escaping issues