fix the issue with pagination for the advanced list

Reviewer: Tiff Go (post commit)

Issue: GCP-8733