STUDIO-2570
Improve pageflow validation