Add x-service filtering

:(