SONAR-5718 Fix grouping issues by component