Redefined batch_filter using order_filter and remove __set_batch_id
Merge pull request #136 from maxigit/44884119_clean_batch_filter

Redefined batch_filter using order_filter and remove __set_batch_id