Restore saving full predicate cross-referencing information