Issue #22393: Fixed image problems and got page number working