Fix perishable_token maintenance issue, fix up remaining pagination issues