Fixed an NPE in the ListPageCollector and simplified the impl