Improve rendering and escape value Strings