Updated filter to filter by only a single service/status too