Updated message filter