added message filtering