fix for non-query_by_client_id messages