Improved filter on messages