REFS: #252 removing extra chars in html and few more fixes