adding initial client_id filtering