Refactoring to fix next/new behavior in page edit
Refactoring to fix next/new behavior in page edit

[#46482189]

concord-consortium/lara,concord-consortium/lara,concord-consortium/lara,concord-consortium/lara,concord-consortium/lara