Bug 5973: Add spans to staff client results