new complete data set pagination, added complete data set sorting, clean up