Fix handling unlimited per page