Improve message filter