Closes #72
Another bugfix for #64. Fifth… time's the charm?
Realized that we need to paginate due to #87