Make Page: pages unserializer more comprehensive

Change-Id: I73a1c693e85554f0ea96d2efd98ce183cf99276a