Fix problems with filter order.