Fixed html-html error and <p> wrapping for text-html