[OE-2546] filter benefits and complications by service
Merge branch 'jira/2546' into feature/orbis