Refactor nrt esri indicators to standard