Fixed HTML Conversion Issues