Fix entry pagination

Closes #2029