Added support for Surrogate Diagnostics for Scan Term entries.