Fix definitions of all indicaotrs with sub indicators