Fixed an issue where page number was not retained on sort