Add services filtering to Client