Improve encoding

* Use double quotes as last resort