Bug fix w/ empty collection.
Progresses on pagination.