Add x-service filtering

circular dependency