Fix issue of displaying text and html