OZP-856 Fix for page number