Forgot to handle order-by and order-dir if they are used