* Fix missing and double escaping