Redefined batch_filter using order_filter and remove __set_batch_id