Support badly-formed content better