fix the issue of client_id, and allow to fetch data multiple times