updated filter order

filter order was still messed up. fixed and tested.