More sort/order/limit fixes (Ref #129)