Use truncate_html to fix HTML truncating issues

Fixes #2518, Fixes #2323