[fix] small fixes from sonar drilldown