Add convertIndicatorDataFields function to indicator