Re-added the pagination which changes based on the filters. Fixes #29