Bug Fix and handling non-html renders