Add html escaping
Make sure all tests are passing