More bug Fixes (excl. HTML entities & Code block content trailing strip)