Tagged continuous-diagnostics-mitigation