ECMS-5357: Fix some problems relate to the SyntaxHighlight