Issue #459 - some work on downloads pagination