diff --git a/src/models/proof.ts b/src/models/proof.ts
index 57ef333..bc1697a 100644
--- a/src/models/proof.ts
+++ b/src/models/proof.ts
@@ -251,7 +251,7 @@ const extractFlagValues = (flagPath: string, path: FlagMatchRulePathSegment[]):
 
         if (keys.length == 1) {
           return opart.map((s, i) => {
-            return { value: s, path: [{ object: o, path: key + "[" + i + "]"}, ... path] };
+            return { value: o, path: [{ object: s, path: key + "[" + i + "]"}, ... path] };
           });
         } else {
           return opart.reduce((res: FlagMatchRuleValue[] | undefined, oin: any, i: number) => {
@@ -314,7 +314,7 @@ const getFirstWithDataAsDate = (flagPaths: string[], path: FlagMatchRulePathSegm
 
 const softwareAgentFromAction =  (action: FlagMatchRuleValue): string | undefined => {
   const agent = getFirstWithData([
-    "softwareAgent", "../../../claim_generator"
+    "softwareAgent/name", "softwareAgent", "../../../claim_generator"
   ], action.path);
   return agent;
 };