Fix search to include client_id, access_token