Fix escaping bug
Add number to text conversion