Added html escaping. Still not implemented everywhere