fixed issues raised by automatic escaping.