Fix for conditions when filtering services via service provider.