Add back message flow filtering.