Make indicator data generator support indicators without sub indicators