Refactor Filters fixed #32 #47 #48 #29

Refactor order and transaction filters