Replaced drill-down with drill down everywhere