Better saved page number management