SONAR-5207 Fix ordering of treemap components