Added sort order for indicator and breakdown