Resolved pagination bugs