Closes #236 pagination fixed