FIXES: #493 Minor Html encode