Changed order of filter implementation and order-by