[Fix Bug 909961] Fix listing pages.
Merge pull request #606 from juliaelman/909961-fix-listing-pages

[Fix Bug 909961] Fix listing pages.