don't loop through all services
Merge pull request #1047 from control-center/feature/CC-175

don't loop through all services