mod. (bz 48341) modify datatype indices and rate aggregator value index.

Change-Id: I0a8e95fd594dd35a08563c92b21a463d4617a415