Fixed a couple of lingering bugs with pagination and current page;