updates for page management issues vivo622 and 616