Brings the CLI in line with pagination changes.
Updated to set data correctly.
A better fix for pagination.
Merge branch 'pagination-fix' into develop

Fixes #659.