add support for ALL unit, support case of no indi data for a given unit