XGC-145: Avoid parsing uri to read page number
2 files changed