Ensure the audit queries are properly addressed

kpi