Use 1-based result page numbers
Fix paging beyond page 2