Added empty message filter and html encoder