Add x-service filtering

"a bit unsafe" becomes "pretty dangerous" if we decide to move this out into it's own component