// Fixed bad entities in KPI