Additional fix for calculated indicators in pivot tables