Multipage ordering tweaks