Stat, Trend, Benchmark modified due to new structure of indicator context