Fix client_id

Use the client_id specified in bbs_query instead of using hardcoded '0'.