Some fixes to supporting documents - added explicit claim_id