Support pagination when not starting on page one; test; code lint cleanup