Can now filter also for message