Fix message filtering