fixes to indicatorservice