Avoid eval operation when using standard HtmlBlocks class & Changed some code to not trigger some unnecesary warnings