Feature/improve service set performance

this should fix performance problems we were seeing with templates that had 10+ constrained services.