Better support for html code