Fix EZP-22397: Page converter major testing and debug
Code cleanup in the Page converter