AI-678 - differentiate indicators also by category