Clean up filter order