Add missing pieces for HTML conversion