FEND-1188 updated logic around getting the page number