pagination fix during refactoring, documentation