Update of vertex diagnostics.
Merged with FSP search update