update to take advantage of new uniform page/single vis deconstruction upstream