Fixed Pagination/ordering errors