oo-diagnostics enhancements

https://trello.com/c/CBLIqG00/214-1-oo-diagnostics-improvements