html escape bug fix, stage1 create bug fix