Better support for shuffle pages