From d882e65071b4e87ac9332f96b12bed46ef41d7d9 Mon Sep 17 00:00:00 2001
From: rdbsolutions <rob@rdbsolutions.co.uk>
Date: Wed, 16 Apr 2025 08:44:45 +0100
Subject: [PATCH] uodated queries to sort deep recursion

---
 components/case/documents.js                  | 14 +++++-----
 components/case/representation/index.js       | 18 ++++++------
 .../representation/representationDetails.js   |  2 +-
 .../case/representation/representationLPA.js  |  4 +--
 .../representationLPADetails.js               |  2 +-
 ...resentationLPAQuestionnaire_enforcement.js |  4 +--
 .../representationLPAQuestionnaire_s78.js     |  4 +--
 components/case/representationList.js         |  4 +--
 components/case/summary.js                    | 18 ++++++------
 .../case/summaryTypes/pinswg_advertsid.js     | 14 +++++-----
 .../case/summaryTypes/pinswg_callinss77id.js  | 12 ++++----
 .../case/summaryTypes/pinswg_commonlandid.js  | 16 +++++------
 .../pinswg_communityinfrastructurelevyid.js   | 12 ++++----
 .../pinswg_compulsorypurchaseordersid.js      | 14 +++++-----
 components/case/summaryTypes/pinswg_dnsid.js  | 16 +++++------
 .../summaryTypes/pinswg_electricityactid.js   | 16 +++++------
 ...pinswg_enforcementlistedbuildingconseid.js | 12 ++++----
 .../pinswg_enforcementnoticeappeals174id.js   | 12 ++++----
 .../pinswg_environmentalpermittingid.js       | 16 +++++------
 .../pinswg_harbourrevisionorderid.js          | 14 +++++-----
 ...pinswg_hedgeshedgerowstreepreservatioid.js | 18 ++++++------
 .../pinswg_householderappealhasid.js          | 10 +++----
 ...pinswg_lawfuldevelopmentcertificatappid.js | 12 ++++----
 components/case/summaryTypes/pinswg_ldpid.js  | 12 ++++----
 ...pinswg_listedbuildingandconservationrid.js | 12 ++++----
 .../pinswg_maintenanceoflands217id.js         | 12 ++++----
 .../pinswg_miscellaneouscasewordid.js         | 16 +++++------
 .../summaryTypes/pinswg_nonvalidationid.js    | 10 +++----
 .../pinswg_planningappeals78id.js             | 12 ++++----
 .../pinswg_planningconditionss73s79id.js      | 12 ++++----
 .../pinswg_planningobligationappeals106id.js  | 12 ++++----
 components/case/summaryTypes/pinswg_rowid.js  | 18 ++++++------
 .../pinswg_transportandworkactid.js           |  6 ++--
 .../case/summaryTypes/pinswg_wayleaveid.js    | 16 +++++------
 components/elements/index.js                  |  9 +++---
 components/myportal.js                        |  2 +-
 components/myportal/advancedsearch.js         |  4 +--
 .../myportal/awaitingsubmissionfromblob.js    |  4 +--
 components/myportal/topthree.js               |  4 +--
 components/myportal/topthree_reps.js          | 10 +++----
 components/myportal/viewall.js                | 28 +++++++++----------
 components/newappeal/buildcheckrow.js         |  4 +--
 components/newappeal/buildchecksection.js     |  2 +-
 components/newappeal/buildrow.js              |  2 +-
 components/newappeal/createCase.js            |  4 +--
 components/pdftemplates/appealRow_pdf.js      |  2 +-
 components/search/addresssearchresults.js     | 12 ++++----
 components/search/advancedsearch.js           |  6 ++--
 components/search/dnssearchresults.js         |  8 +++---
 components/search/searchresults.js            | 10 +++----
 components/utils/index.js                     | 16 +++++------
 pages/api/endpoint/getmylpacases_api.js       |  4 +--
 pages/myportal/[appealtypes].js               |  2 +-
 pages/newappeal/[appealtypes].js              |  2 +-
 54 files changed, 270 insertions(+), 267 deletions(-)

diff --git a/components/case/documents.js b/components/case/documents.js
index daeb274d..e288f843 100644
--- a/components/case/documents.js
+++ b/components/case/documents.js
@@ -158,7 +158,7 @@ const DocumentDetails = (props) => {
                                     <option value="all" key="00">
                                         {router.locale == "cy"
                                             ? jsonpath({
-                                                  path: '$..[?(@.value=="All")].value_cy',
+                                                  path: '$..[?(@ && @.value=="All")].value_cy',
                                                   json: transLookup,
                                                   eval: true,
                                               })
@@ -175,7 +175,7 @@ const DocumentDetails = (props) => {
                                                 {router.locale == "cy"
                                                     ? jsonpath({
                                                           path:
-                                                              '$..[?(@.value=="' +
+                                                              '$..[?(@ && @.value=="' +
                                                               item.pinswg_isharedocumentlocationsLabel +
                                                               '")].value_cy',
                                                           json: transLookup,
@@ -322,7 +322,7 @@ const DocumentDetails = (props) => {
                         documentDetailsArr.map((item, key) => {
                             let detailsObj = jsonpath({
                                 path:
-                                    "$..[?(@._pinswg_documentids_value=='" +
+                                    "$..[?(@ && @._pinswg_documentids_value=='" +
                                     incidentid +
                                     "')]",
                                 json: item,
@@ -410,7 +410,7 @@ const DocumentDetails = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_isharedocumentlocations@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -575,7 +575,7 @@ const DocumentDetails = (props) => {
                                                 {router.locale == "cy"
                                                     ? jsonpath({
                                                           path:
-                                                              '$..[?(@.value=="' +
+                                                              '$..[?(@ && @.value=="' +
                                                               item.pinswg_isharedocumentlocationsLabel +
                                                               '")].value_cy',
                                                           jsonL: transLookup,
@@ -731,7 +731,7 @@ const DocumentDetails = (props) => {
                                 documentDetailsArr.map((item, key) => {
                                     let detailsObj = jsonpath({
                                         path:
-                                            "$..[?(@._pinswg_documentids_value=='" +
+                                            "$..[?(@ && @._pinswg_documentids_value=='" +
                                             incidentid +
                                             "')]",
                                         json: item,
@@ -824,7 +824,7 @@ const DocumentDetails = (props) => {
                                                 {router.locale == "cy"
                                                     ? jsonpath({
                                                           path:
-                                                              '$..[?(@.value=="' +
+                                                              '$..[?(@ && @.value=="' +
                                                               detailsObj[
                                                                   "pinswg_isharedocumentlocations@OData.Community.Display.V1.FormattedValue"
                                                               ] +
diff --git a/components/case/representation/index.js b/components/case/representation/index.js
index 64b4c03a..10fe030d 100644
--- a/components/case/representation/index.js
+++ b/components/case/representation/index.js
@@ -210,18 +210,18 @@ let MakeRepresentation = (props) => {
 
     currentType == "searchResultsObj"
         ? (casesObj = jsonpath({
-              path: '$..[?(@.title=="' + caseReference + '")]',
+              path: '$..[?(@ && @.title=="' + caseReference + '")]',
               json: setCaseQueryObj,
               eval: true,
           }))
         : currentType == "watchedCases"
         ? (casesObj = jsonpath({
-              path: '$..[?(@.ticketnumber=="' + caseReference + '")]',
+              path: '$..[?(@ && @.ticketnumber=="' + caseReference + '")]',
               json: watchedCases,
               eval: true,
           }))
         : (casesObj = jsonpath({
-              path: '$..[?(@.reference=="' + caseReference + '")]',
+              path: '$..[?(@ && @.reference=="' + caseReference + '")]',
               json: setCaseQueryObj,
               eval: true,
           }));
@@ -267,7 +267,7 @@ let MakeRepresentation = (props) => {
 
     resultsObj = jsonpath({
         path:
-            '$..[?(@.ticketnumber=="' +
+            '$..[?(@ && @.ticketnumber=="' +
             currentView.caseReference.currentReference +
             '")]',
         json: setCaseResultsObj,
@@ -280,13 +280,15 @@ let MakeRepresentation = (props) => {
         ? router.query.state == "edit"
             ? jsonpath({
                   path:
-                      '$..[?(@.repfile_name =="' + router.query.created + '")]',
+                      '$..[?(@ && @.repfile_name =="' +
+                      router.query.created +
+                      '")]',
                   json: setCaseDetailsObj,
                   eval: true,
               })
             : jsonpath({
                   path:
-                      '$..[?(@.pinswg_name =="' +
+                      '$..[?(@ && @.pinswg_name =="' +
                       currentView.caseReference.currentReference +
                       '")]',
                   json: setCaseDetailsObj,
@@ -294,7 +296,7 @@ let MakeRepresentation = (props) => {
               })
         : jsonpath({
               path:
-                  '$..[?(@.pinswg_name =="' +
+                  '$..[?(@ && @.pinswg_name =="' +
                   currentView.caseReference.currentReference +
                   '")]',
               json: setCaseDetailsObj,
@@ -943,7 +945,7 @@ let MakeRepresentation = (props) => {
         var detailsObj = {};
 
         detailsObj = jsonpath({
-            path: '$..[?(@.pinswg_name=="' + caseReference + '")]',
+            path: '$..[?(@ && @.pinswg_name=="' + caseReference + '")]',
             json: setCaseDetailsObj,
             eval: true,
         });
diff --git a/components/case/representation/representationDetails.js b/components/case/representation/representationDetails.js
index afd6e0e3..0276a089 100644
--- a/components/case/representation/representationDetails.js
+++ b/components/case/representation/representationDetails.js
@@ -29,7 +29,7 @@ const RepDetails = (props) => {
         : caseReference;
 
     detailsObj = jsonpath({
-        path: '$..[?(@.pinswg_name=="' + caseReference + '")]',
+        path: '$..[?(@ && @.pinswg_name=="' + caseReference + '")]',
         json: setCaseDetailsObj,
         eval: true,
     });
diff --git a/components/case/representation/representationLPA.js b/components/case/representation/representationLPA.js
index f782526b..19eb3b5b 100644
--- a/components/case/representation/representationLPA.js
+++ b/components/case/representation/representationLPA.js
@@ -178,7 +178,7 @@ let RepLPA = (props) => {
 
     detailsObj = jsonpath({
         path:
-            '$..[?(@.pinswg_name=="' +
+            '$..[?(@ && @.pinswg_name=="' +
             currentView.caseReference.currentReference +
             '")]',
         json: setCaseDetailsObj,
@@ -197,7 +197,7 @@ let RepLPA = (props) => {
 
     resultsObj = jsonpath({
         path:
-            '$..[?(@.pinswg_name=="' +
+            '$..[?@ && @.pinswg_name=="' +
             currentView.caseReference.currentReference +
             '")]',
         json: setCaseResultssObj,
diff --git a/components/case/representation/representationLPADetails.js b/components/case/representation/representationLPADetails.js
index 8ef1b362..55c19618 100644
--- a/components/case/representation/representationLPADetails.js
+++ b/components/case/representation/representationLPADetails.js
@@ -21,7 +21,7 @@ const RepLPADetails = (props) => {
     var detailsObj = {};
 
     detailsObj = jsonpath({
-        path: '$..[?(@.pinswg_name=="' + caseReference + '")]',
+        path: '$..[?(@ && @.pinswg_name=="' + caseReference + '")]',
         json: setCaseDetailsObj,
         eval: true,
     });
diff --git a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js
index 6230d22f..d8fdfbe0 100644
--- a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js
+++ b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js
@@ -60,7 +60,7 @@ let Enforcement_Questionnaire = (props) => {
 
     detailsObj = jsonpath({
         path:
-            '$..[?(@.pinswg_name=="' +
+            '$..[?(@ && @.pinswg_name=="' +
             currentView.caseReference.currentReference +
             '")]',
         json: setCaseDetailsObj,
@@ -83,7 +83,7 @@ let Enforcement_Questionnaire = (props) => {
 
     resultsObj = jsonpath({
         path:
-            '$..[?(@.ticketnumber=="' +
+            '$..[?(@ && @.ticketnumber=="' +
             currentView.caseReference.currentReference +
             '")]',
         json: setCaseResultssObj,
diff --git a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js
index 6b6d2a29..b0260007 100644
--- a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js
+++ b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_s78.js
@@ -62,7 +62,7 @@ let S78_Questionnaire = (props) => {
 
     detailsObj = jsonpath({
         path:
-            '$..[?(@.pinswg_name=="' +
+            '$..[?(@ && @.pinswg_name=="' +
             currentView.caseReference.currentReference +
             '")]',
         json: setCaseResultssObj,
@@ -85,7 +85,7 @@ let S78_Questionnaire = (props) => {
 
     resultsObj = jsonpath({
         path:
-            "$..[?(@." +
+            "$..[?(@ && @." +
             (router.query.hasOwnProperty("state")
                 ? router.query.state == "edit"
                     ? "caseRef"
diff --git a/components/case/representationList.js b/components/case/representationList.js
index bd95c1c9..13f81d5f 100644
--- a/components/case/representationList.js
+++ b/components/case/representationList.js
@@ -59,7 +59,7 @@ const RepresentationList = (props) => {
                     {representationsArr.map((item, key) => {
                         let detailsObj = jsonpath({
                             path:
-                                "$..[?(@.pinswg_representationsid=='" +
+                                "$..[?(@ && @.pinswg_representationsid=='" +
                                 incidentid +
                                 "')]",
                             json: item,
@@ -91,7 +91,7 @@ const RepresentationList = (props) => {
                                     {router.locale == "cy"
                                         ? jsonpath({
                                               path:
-                                                  '$..[?(@.value=="' +
+                                                  '$..[?(@ && @.value=="' +
                                                   detailsObj[
                                                       "pinswg_isharedocumentlocations@OData.Community.Display.V1.FormattedValue"
                                                   ] +
diff --git a/components/case/summary.js b/components/case/summary.js
index 34c466cc..c39190c1 100644
--- a/components/case/summary.js
+++ b/components/case/summary.js
@@ -134,7 +134,7 @@ const CaseSummary = (props) => {
     const isWatchedCase = (whichIncident) => {
         let isWatched = jsonpath({
             path:
-                "$..value[?(@._pinswg_watchedcase_value=='" +
+                "$..value[?(@ && @._pinswg_watchedcase_value=='" +
                 whichIncident +
                 "')]",
             json: watchedCases,
@@ -176,30 +176,30 @@ const CaseSummary = (props) => {
 
     currentType == "searchResultsObj"
         ? (casesObj = jsonpath({
-              path: '$..[?(@.title=="' + caseReference + '")]',
+              path: '$..[?(@ && @.title=="' + caseReference + '")]',
               json: searchResultsObj,
               eval: true,
           }))
         : currentType == "watchedCases"
         ? (casesObj = jsonpath({
-              path: '$..[?(@.pinswg_title=="' + caseReference + '")]',
+              path: '$..[?(@ && @.pinswg_title=="' + caseReference + '")]',
               json: setCaseQueryObj,
               eval: true,
           }))
         : currentType == "myCases"
         ? (casesObj = jsonpath({
-              path: '$..[?(@.pinswg_title=="' + caseReference + '")]',
+              path: '$..[?(@ && @.pinswg_title=="' + caseReference + '")]',
               json: setCaseQueryObj,
               eval: true,
           }))
         : currentType == "directResultsObj"
         ? (casesObj = jsonpath({
-              path: '$..[?(@.ticketnumber=="' + caseReference + '")]',
+              path: '$..[?(@ && @.ticketnumber=="' + caseReference + '")]',
               json: setCaseQueryObj,
               eval: true,
           }))
         : (casesObj = jsonpath({
-              path: '$..[?(@.reference=="' + caseReference + '")]',
+              path: '$..[?(@ && @.reference=="' + caseReference + '")]',
               json: setCaseQueryObj,
               eval: true,
           }));
@@ -210,14 +210,14 @@ const CaseSummary = (props) => {
 
     currentType == "searchResultsObj"
         ? (detailsObj = jsonpath({
-              path: '$..[?(@.pinswg_name=="' + caseReference + '")]',
+              path: '$..[?(@ && @.pinswg_name=="' + caseReference + '")]',
               json: searchDetailsObj,
               eval: true,
           }))
         : currentType == "directResultsObj"
         ? (detailsObj = setCaseDetailsObj[0].value[0])
         : (detailsObj = jsonpath({
-              path: '$..[?(@.pinswg_name=="' + caseReference + '")]',
+              path: '$..[?(@ && @.pinswg_name=="' + caseReference + '")]',
               jsopn: setCaseDetailsObj,
               eval: true,
           }));
@@ -399,7 +399,7 @@ const CaseSummary = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_casestage@OData.Community.Display.V1.FormattedValue"
                                                       ] +
diff --git a/components/case/summaryTypes/pinswg_advertsid.js b/components/case/summaryTypes/pinswg_advertsid.js
index 63906eb2..89af6575 100644
--- a/components/case/summaryTypes/pinswg_advertsid.js
+++ b/components/case/summaryTypes/pinswg_advertsid.js
@@ -29,7 +29,7 @@ const Pinswg_advertsid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -54,7 +54,7 @@ const Pinswg_advertsid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_speacialistcaseprocess@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -76,7 +76,7 @@ const Pinswg_advertsid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -112,7 +112,7 @@ const Pinswg_advertsid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -133,7 +133,7 @@ const Pinswg_advertsid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -154,7 +154,7 @@ const Pinswg_advertsid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "statuscode@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -179,7 +179,7 @@ const Pinswg_advertsid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                       ] +
diff --git a/components/case/summaryTypes/pinswg_callinss77id.js b/components/case/summaryTypes/pinswg_callinss77id.js
index d7129125..3d9bdb0a 100644
--- a/components/case/summaryTypes/pinswg_callinss77id.js
+++ b/components/case/summaryTypes/pinswg_callinss77id.js
@@ -29,7 +29,7 @@ const Pinswg_callinss77id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -53,7 +53,7 @@ const Pinswg_callinss77id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -89,7 +89,7 @@ const Pinswg_callinss77id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -110,7 +110,7 @@ const Pinswg_callinss77id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -131,7 +131,7 @@ const Pinswg_callinss77id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "statuscode@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -155,7 +155,7 @@ const Pinswg_callinss77id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                       ] +
diff --git a/components/case/summaryTypes/pinswg_commonlandid.js b/components/case/summaryTypes/pinswg_commonlandid.js
index 107099fc..ffa70fa2 100644
--- a/components/case/summaryTypes/pinswg_commonlandid.js
+++ b/components/case/summaryTypes/pinswg_commonlandid.js
@@ -29,7 +29,7 @@ const Pinswg_commonlandid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -53,7 +53,7 @@ const Pinswg_commonlandid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -89,7 +89,7 @@ const Pinswg_commonlandid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -110,7 +110,7 @@ const Pinswg_commonlandid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -131,7 +131,7 @@ const Pinswg_commonlandid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "statuscode@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -155,7 +155,7 @@ const Pinswg_commonlandid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -231,7 +231,7 @@ const Pinswg_commonlandid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.pinswg_lpa=="' +
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
                                                       '")].value_cy',
                                                   json: transLookup,
@@ -239,7 +239,7 @@ const Pinswg_commonlandid = (props) => {
                                               })
                                             : jsonpath({
                                                   path:
-                                                      '$..[?(@.pinswg_lpa=="' +
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
                                                       '")].value',
                                                   json: transLookup,
diff --git a/components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js b/components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js
index 9c2f7a3b..5539fb8b 100644
--- a/components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js
+++ b/components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js
@@ -29,7 +29,7 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -53,7 +53,7 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -89,7 +89,7 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -110,7 +110,7 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -131,7 +131,7 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "statuscode@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -155,7 +155,7 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                       ] +
diff --git a/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js b/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js
index 06a339eb..0d29951b 100644
--- a/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js
+++ b/components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js
@@ -29,7 +29,7 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -69,7 +69,7 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -90,7 +90,7 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -111,7 +111,7 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "statuscode@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -135,7 +135,7 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -211,7 +211,7 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.pinswg_lpa=="' +
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
                                                       '")].value_cy',
                                                   json: transLookup,
@@ -219,7 +219,7 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
                                               })
                                             : jsonpath({
                                                   path:
-                                                      '$..[?(@.pinswg_lpa=="' +
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
                                                       '")].value',
                                                   json: transLookup,
diff --git a/components/case/summaryTypes/pinswg_dnsid.js b/components/case/summaryTypes/pinswg_dnsid.js
index d2a8a95d..dbd1c73a 100644
--- a/components/case/summaryTypes/pinswg_dnsid.js
+++ b/components/case/summaryTypes/pinswg_dnsid.js
@@ -124,7 +124,7 @@ const Pinswg_dnsid = (props) => {
                                             {router.locale == "cy"
                                                 ? jsonpath({
                                                       path:
-                                                          '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           casesObj[
                                                               "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                           ] +
@@ -153,7 +153,7 @@ const Pinswg_dnsid = (props) => {
                                                 {router.locale == "cy"
                                                     ? jsonpath({
                                                           path:
-                                                              '$..[?(@.value=="' +
+                                                              '$..[?(@ && @.value=="' +
                                                               detailsObj.pinswg_webaddress +
                                                               '")].value_cy',
                                                           json: transLookup,
@@ -191,7 +191,7 @@ const Pinswg_dnsid = (props) => {
                                             {router.locale == "cy"
                                                 ? jsonpath({
                                                       path:
-                                                          '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           casesObj[
                                                               "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                           ] +
@@ -212,7 +212,7 @@ const Pinswg_dnsid = (props) => {
                                             {router.locale == "cy"
                                                 ? jsonpath({
                                                       path:
-                                                          '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           detailsObj[
                                                               "pinswg_choiceofprocedure@OData.Community.Display.V1.FormattedValue"
                                                           ] +
@@ -236,7 +236,7 @@ const Pinswg_dnsid = (props) => {
                                             {router.locale == "cy"
                                                 ? jsonpath({path:
                                                       
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                           casesObj[
                                                               "statuscode@OData.Community.Display.V1.FormattedValue"
                                                           ] +
@@ -275,7 +275,7 @@ const Pinswg_dnsid = (props) => {
                                             {router.locale == "cy"
                                                 ? jsonpath({
                                                       path:
-                                                          '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           detailsObj[
                                                               "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                           ] +
@@ -344,7 +344,7 @@ const Pinswg_dnsid = (props) => {
                                             {router.locale == "cy"
                                                 ? jsonpath({
                                                       path:
-                                                          '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           detailsObj[
                                                               "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                           ] +
@@ -444,7 +444,7 @@ const Pinswg_dnsid = (props) => {
                                         <dd className="govuk-summary-list__value">
                                             {router.locale == "cy"
                                                 ? jsonpath({path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                           detailsObj.pinswg_recommendation +
                                                           '")].value_cy', 
                                                           transLookup,
diff --git a/components/case/summaryTypes/pinswg_electricityactid.js b/components/case/summaryTypes/pinswg_electricityactid.js
index 4dbabebb..b54fa13a 100644
--- a/components/case/summaryTypes/pinswg_electricityactid.js
+++ b/components/case/summaryTypes/pinswg_electricityactid.js
@@ -67,7 +67,7 @@ const Pinswg_electricityactid = (props) => {
                                             {router.locale == "cy"
                                                 ? jsonpath({
                                                       path:
-                                                          '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           casesObj[
                                                               "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                           ] +
@@ -91,7 +91,7 @@ const Pinswg_electricityactid = (props) => {
                                             {router.locale == "cy"
                                                 ? jsonpath({
                                                       path:
-                                                          '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           casesObj[
                                                               "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                           ] +
@@ -129,7 +129,7 @@ const Pinswg_electricityactid = (props) => {
                                             {router.locale == "cy"
                                                 ? jsonpath({
                                                       path:
-                                                          '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           detailsObj[
                                                               "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                           ] +
@@ -152,7 +152,7 @@ const Pinswg_electricityactid = (props) => {
                                             {router.locale == "cy"
                                                 ? jsonpath({
                                                       path:
-                                                          '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           detailsObj[
                                                               "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                           ] +
@@ -173,7 +173,7 @@ const Pinswg_electricityactid = (props) => {
                                             {router.locale == "cy"
                                                 ? jsonpath({
                                                       path:
-                                                          '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           casesObj[
                                                               "statuscode@OData.Community.Display.V1.FormattedValue"
                                                           ] +
@@ -197,7 +197,7 @@ const Pinswg_electricityactid = (props) => {
                                             {router.locale == "cy"
                                                 ? jsonpath({
                                                       path:
-                                                          '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           detailsObj[
                                                               "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                           ] +
@@ -273,7 +273,7 @@ const Pinswg_electricityactid = (props) => {
                                             {router.locale == "cy"
                                                 ? jsonpath({
                                                       path:
-                                                          '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           detailsObj.pinswg_recommendation +
                                                           '")].value_cy',
                                                       json: transLookup,
@@ -296,7 +296,7 @@ const Pinswg_electricityactid = (props) => {
                                                 {router.locale == "cy"
                                                     ? jsonpath({
                                                           path:
-                                                              '$..[?(@.value=="' +
+                                                              '$..[?(@ && @.value=="' +
                                                               detailsObj.pinswg_webaddress +
                                                               '")].value_cy',
                                                           json: transLookup,
diff --git a/components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js b/components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js
index 6b2672da..6f83fab1 100644
--- a/components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js
+++ b/components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js
@@ -29,7 +29,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -53,7 +53,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -89,7 +89,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -110,7 +110,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -131,7 +131,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "statuscode@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -155,7 +155,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                       ] +
diff --git a/components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js b/components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js
index 61581c73..6c62ace5 100644
--- a/components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js
+++ b/components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js
@@ -29,7 +29,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -53,7 +53,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -89,7 +89,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -110,7 +110,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -131,7 +131,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "statuscode@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -155,7 +155,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                       ] +
diff --git a/components/case/summaryTypes/pinswg_environmentalpermittingid.js b/components/case/summaryTypes/pinswg_environmentalpermittingid.js
index 96dd2472..807a633f 100644
--- a/components/case/summaryTypes/pinswg_environmentalpermittingid.js
+++ b/components/case/summaryTypes/pinswg_environmentalpermittingid.js
@@ -29,7 +29,7 @@ const Pinswg_environmentalpermittingid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -53,7 +53,7 @@ const Pinswg_environmentalpermittingid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -89,7 +89,7 @@ const Pinswg_environmentalpermittingid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -110,7 +110,7 @@ const Pinswg_environmentalpermittingid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -131,7 +131,7 @@ const Pinswg_environmentalpermittingid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "statuscode@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -155,7 +155,7 @@ const Pinswg_environmentalpermittingid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -231,7 +231,7 @@ const Pinswg_environmentalpermittingid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.pinswg_lpa=="' +
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
                                                       '")].value_cy',
                                                   json: transLookup,
@@ -239,7 +239,7 @@ const Pinswg_environmentalpermittingid = (props) => {
                                               })
                                             : jsonpath({
                                                   path:
-                                                      '$..[?(@.pinswg_lpa=="' +
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
                                                       '")].value',
                                                   json: transLookup,
diff --git a/components/case/summaryTypes/pinswg_harbourrevisionorderid.js b/components/case/summaryTypes/pinswg_harbourrevisionorderid.js
index d286782b..5368e19d 100644
--- a/components/case/summaryTypes/pinswg_harbourrevisionorderid.js
+++ b/components/case/summaryTypes/pinswg_harbourrevisionorderid.js
@@ -67,7 +67,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
                                             {router.locale == "cy"
                                                 ? jsonpath({
                                                       path:
-                                                          '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           casesObj[
                                                               "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                           ] +
@@ -91,7 +91,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
                                             {router.locale == "cy"
                                                 ? jsonpath({
                                                       path:
-                                                          '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           casesObj[
                                                               "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                           ] +
@@ -129,7 +129,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
                                             {router.locale == "cy"
                                                 ? jsonpath({
                                                       path:
-                                                          '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           detailsObj[
                                                               "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                           ] +
@@ -150,7 +150,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
                                             {router.locale == "cy"
                                                 ? jsonpath({
                                                       path:
-                                                          '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           casesObj[
                                                               "statuscode@OData.Community.Display.V1.FormattedValue"
                                                           ] +
@@ -174,7 +174,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
                                             {router.locale == "cy"
                                                 ? jsonpath({
                                                       path:
-                                                          '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           detailsObj[
                                                               "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                           ] +
@@ -250,7 +250,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
                                             {router.locale == "cy"
                                                 ? jsonpath({
                                                       path:
-                                                          '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           detailsObj.pinswg_recommendation +
                                                           '")].value_cy',
                                                       json: transLookup,
@@ -273,7 +273,7 @@ const Pinswg_harbourrevisionorderid = (props) => {
                                                 {router.locale == "cy"
                                                     ? jsonpath({
                                                           path:
-                                                              '$..[?(@.value=="' +
+                                                              '$..[?(@ && @.value=="' +
                                                               detailsObj.pinswg_webaddress +
                                                               '")].value_cy',
                                                           json: transLookup,
diff --git a/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js b/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js
index 48f35bf9..873bcf3e 100644
--- a/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js
+++ b/components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js
@@ -29,7 +29,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -54,7 +54,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_specialistcaseprocess@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -76,7 +76,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -112,7 +112,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -133,7 +133,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -154,7 +154,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "statuscode@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -178,7 +178,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -254,7 +254,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.pinswg_lpa=="' +
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
                                                       '")].value_cy',
                                                   json: transLookup,
@@ -262,7 +262,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
                                               })
                                             : jsonpath({
                                                   path:
-                                                      '$..[?(@.pinswg_lpa=="' +
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
                                                       '")].value',
                                                   json: transLookup,
diff --git a/components/case/summaryTypes/pinswg_householderappealhasid.js b/components/case/summaryTypes/pinswg_householderappealhasid.js
index e94f86db..87a29165 100644
--- a/components/case/summaryTypes/pinswg_householderappealhasid.js
+++ b/components/case/summaryTypes/pinswg_householderappealhasid.js
@@ -29,7 +29,7 @@ const Pinswg_householderappealhasid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -53,7 +53,7 @@ const Pinswg_householderappealhasid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -89,7 +89,7 @@ const Pinswg_householderappealhasid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -110,7 +110,7 @@ const Pinswg_householderappealhasid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "statuscode@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -134,7 +134,7 @@ const Pinswg_householderappealhasid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                       ] +
diff --git a/components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js b/components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js
index 0ab88510..6574243c 100644
--- a/components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js
+++ b/components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js
@@ -29,7 +29,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -53,7 +53,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -89,7 +89,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -110,7 +110,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -131,7 +131,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "statuscode@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -155,7 +155,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                       ] +
diff --git a/components/case/summaryTypes/pinswg_ldpid.js b/components/case/summaryTypes/pinswg_ldpid.js
index 693466ee..11c0210d 100644
--- a/components/case/summaryTypes/pinswg_ldpid.js
+++ b/components/case/summaryTypes/pinswg_ldpid.js
@@ -29,7 +29,7 @@ const Pinswg_ldpid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -53,7 +53,7 @@ const Pinswg_ldpid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -89,7 +89,7 @@ const Pinswg_ldpid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -110,7 +110,7 @@ const Pinswg_ldpid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -131,7 +131,7 @@ const Pinswg_ldpid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "statuscode@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -155,7 +155,7 @@ const Pinswg_ldpid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                       ] +
diff --git a/components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js b/components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js
index f111dc26..a79642bd 100644
--- a/components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js
+++ b/components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js
@@ -29,7 +29,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -53,7 +53,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -89,7 +89,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -110,7 +110,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -131,7 +131,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "statuscode@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -155,7 +155,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                       ] +
diff --git a/components/case/summaryTypes/pinswg_maintenanceoflands217id.js b/components/case/summaryTypes/pinswg_maintenanceoflands217id.js
index 3ed23e25..770cdc16 100644
--- a/components/case/summaryTypes/pinswg_maintenanceoflands217id.js
+++ b/components/case/summaryTypes/pinswg_maintenanceoflands217id.js
@@ -29,7 +29,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -53,7 +53,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -89,7 +89,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -110,7 +110,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -131,7 +131,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "statuscode@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -155,7 +155,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                       ] +
diff --git a/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js b/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js
index b79d3303..0212cbcc 100644
--- a/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js
+++ b/components/case/summaryTypes/pinswg_miscellaneouscasewordid.js
@@ -29,7 +29,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -53,7 +53,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -89,7 +89,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -110,7 +110,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -131,7 +131,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "statuscode@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -155,7 +155,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -231,7 +231,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.pinswg_lpa=="' +
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
                                                       '")].value_cy',
                                                   json: transLookup,
@@ -239,7 +239,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
                                               })
                                             : jsonpath({
                                                   path:
-                                                      '$..[?(@.pinswg_lpa=="' +
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
                                                       '")].value',
                                                   json: transLookup,
diff --git a/components/case/summaryTypes/pinswg_nonvalidationid.js b/components/case/summaryTypes/pinswg_nonvalidationid.js
index 3d078776..2e0e62b0 100644
--- a/components/case/summaryTypes/pinswg_nonvalidationid.js
+++ b/components/case/summaryTypes/pinswg_nonvalidationid.js
@@ -29,7 +29,7 @@ const Pinswg_nonvalidationid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -53,7 +53,7 @@ const Pinswg_nonvalidationid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -88,7 +88,7 @@ const Pinswg_nonvalidationid = (props) => {
                                     <dd className="govuk-summary-list__value">
                                         {router.locale == "cy"
                                             ? jsonpath({path:
-                                                  '$..[?(@.value=="' +
+                                                  '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -109,7 +109,7 @@ const Pinswg_nonvalidationid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "statuscode@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -133,7 +133,7 @@ const Pinswg_nonvalidationid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_decisionissued@OData.Community.Display.V1.FormattedValue"
                                                       ] +
diff --git a/components/case/summaryTypes/pinswg_planningappeals78id.js b/components/case/summaryTypes/pinswg_planningappeals78id.js
index b70340f7..37666618 100644
--- a/components/case/summaryTypes/pinswg_planningappeals78id.js
+++ b/components/case/summaryTypes/pinswg_planningappeals78id.js
@@ -29,7 +29,7 @@ const Pinswg_planningappeals78id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -53,7 +53,7 @@ const Pinswg_planningappeals78id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -89,7 +89,7 @@ const Pinswg_planningappeals78id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -110,7 +110,7 @@ const Pinswg_planningappeals78id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -134,7 +134,7 @@ const Pinswg_planningappeals78id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "statuscode@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -158,7 +158,7 @@ const Pinswg_planningappeals78id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_dicision@OData.Community.Display.V1.FormattedValue"
                                                       ] +
diff --git a/components/case/summaryTypes/pinswg_planningconditionss73s79id.js b/components/case/summaryTypes/pinswg_planningconditionss73s79id.js
index b34be7cd..8cc278b9 100644
--- a/components/case/summaryTypes/pinswg_planningconditionss73s79id.js
+++ b/components/case/summaryTypes/pinswg_planningconditionss73s79id.js
@@ -29,7 +29,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -53,7 +53,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -89,7 +89,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -110,7 +110,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -131,7 +131,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "statuscode@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -155,7 +155,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                       ] +
diff --git a/components/case/summaryTypes/pinswg_planningobligationappeals106id.js b/components/case/summaryTypes/pinswg_planningobligationappeals106id.js
index 389a719b..113ea09f 100644
--- a/components/case/summaryTypes/pinswg_planningobligationappeals106id.js
+++ b/components/case/summaryTypes/pinswg_planningobligationappeals106id.js
@@ -29,7 +29,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -53,7 +53,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -89,7 +89,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -110,7 +110,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -131,7 +131,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "statuscode@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -155,7 +155,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                       ] +
diff --git a/components/case/summaryTypes/pinswg_rowid.js b/components/case/summaryTypes/pinswg_rowid.js
index d47b0e3d..e26b34d1 100644
--- a/components/case/summaryTypes/pinswg_rowid.js
+++ b/components/case/summaryTypes/pinswg_rowid.js
@@ -29,7 +29,7 @@ const Pinswg_rowid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -54,7 +54,7 @@ const Pinswg_rowid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_specialistcaseprocess@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -76,7 +76,7 @@ const Pinswg_rowid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -112,7 +112,7 @@ const Pinswg_rowid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -133,7 +133,7 @@ const Pinswg_rowid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -154,7 +154,7 @@ const Pinswg_rowid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "statuscode@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -178,7 +178,7 @@ const Pinswg_rowid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -254,7 +254,7 @@ const Pinswg_rowid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.pinswg_lpa=="' +
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
                                                       '")].value_cy',
                                                   json: transLookup,
@@ -262,7 +262,7 @@ const Pinswg_rowid = (props) => {
                                               })
                                             : jsonpath({
                                                   path:
-                                                      '$..[?(@.pinswg_lpa=="' +
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
                                                       '")].value',
                                                   json: transLookup,
diff --git a/components/case/summaryTypes/pinswg_transportandworkactid.js b/components/case/summaryTypes/pinswg_transportandworkactid.js
index fb4091f6..161eac01 100644
--- a/components/case/summaryTypes/pinswg_transportandworkactid.js
+++ b/components/case/summaryTypes/pinswg_transportandworkactid.js
@@ -67,7 +67,7 @@ const Pinswg_transportandworkactid = (props) => {
                                             {router.locale == "cy"
                                                 ? jsonpath({
                                                       path:
-                                                          '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           casesObj[
                                                               "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                           ] +
@@ -94,7 +94,7 @@ const Pinswg_transportandworkactid = (props) => {
                                             {router.locale == "cy"
                                                 ? jsonpath({
                                                       path:
-                                                          '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           detailsObj.pinswg_recommendation +
                                                           '")].value_cy',
                                                       json: transLookup,
@@ -117,7 +117,7 @@ const Pinswg_transportandworkactid = (props) => {
                                                 {router.locale == "cy"
                                                     ? jsonpath({
                                                           path:
-                                                              '$..[?(@.value=="' +
+                                                              '$..[?(@ && @.value=="' +
                                                               detailsObj.pinswg_webaddress +
                                                               '")].value_cy',
                                                           json: transLookup,
diff --git a/components/case/summaryTypes/pinswg_wayleaveid.js b/components/case/summaryTypes/pinswg_wayleaveid.js
index 61e4f1f3..c75e9dac 100644
--- a/components/case/summaryTypes/pinswg_wayleaveid.js
+++ b/components/case/summaryTypes/pinswg_wayleaveid.js
@@ -29,7 +29,7 @@ const Pinswg_wayleaveid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -53,7 +53,7 @@ const Pinswg_wayleaveid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -89,7 +89,7 @@ const Pinswg_wayleaveid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_procedure@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -110,7 +110,7 @@ const Pinswg_wayleaveid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_typeofevent@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -131,7 +131,7 @@ const Pinswg_wayleaveid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       casesObj[
                                                           "statuscode@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -155,7 +155,7 @@ const Pinswg_wayleaveid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       detailsObj[
                                                           "pinswg_decision@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -231,7 +231,7 @@ const Pinswg_wayleaveid = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.pinswg_lpa=="' +
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
                                                       '")].value_cy',
                                                   json: transLookup,
@@ -239,7 +239,7 @@ const Pinswg_wayleaveid = (props) => {
                                               })
                                             : jsonpath({
                                                   path:
-                                                      '$..[?(@.pinswg_lpa=="' +
+                                                      '$..[?(@ && @.pinswg_lpa=="' +
                                                       detailsObj.pinswg_relevantauthorityname +
                                                       '")].value',
                                                   json: transLookup,
diff --git a/components/elements/index.js b/components/elements/index.js
index 4f1007cb..8a4d84bf 100644
--- a/components/elements/index.js
+++ b/components/elements/index.js
@@ -1340,7 +1340,8 @@ const RenderPickList = ({
     let { t } = useTranslation();
 
     var dropdownObj = jsonpath({
-        path: "$..value[?(@.LogicalName=='" + datafieldname + "')]..Options",
+        path:
+            "$..value[?(@ && @.LogicalName=='" + datafieldname + "')]..Options",
         json: picklistData,
         eval: true,
     });
@@ -1726,7 +1727,7 @@ export const FieldsTranslations = (label) => {
     let labelTrans =
         router.locale == "cy"
             ? jsonpath({
-                  path: '$..[?(@.value=="' + label + '")].value_cy',
+                  path: '$..[?(@ && @.value=="' + label + '")].value_cy',
                   json: formObj,
                   eval: true,
               })[0]
@@ -1745,7 +1746,7 @@ const PickListTranslations = (optionValue) => {
     let optionTrans =
         router.locale == "cy"
             ? jsonpath({
-                  path: '$..[?(@.value=="' + optionValue + '")].value_cy',
+                  path: '$..[?(@ && @.value=="' + optionValue + '")].value_cy',
                   json: pickListLookup,
                   eval: true,
               })
@@ -1945,7 +1946,7 @@ const RenderFileUpload = (field) => {
     const filelistObj = field.fileList || {};
 
     const blobList = jsonpath({
-        path: "$..[?(@.documentType=='" + field.documentTypeCode + "')]",
+        path: "$..[?(@ && @.documentType=='" + field.documentTypeCode + "')]",
         json: filelistObj,
         eval: true,
     });
diff --git a/components/myportal.js b/components/myportal.js
index 1387da38..495bb19d 100644
--- a/components/myportal.js
+++ b/components/myportal.js
@@ -108,7 +108,7 @@ const MyPortal = (props) => {
                             {router.locale == "cy"
                                 ? jsonpath({
                                       path:
-                                          '$..[?(@.value=="' +
+                                          '$..[?(@ && @.value=="' +
                                           props.accountDetails.accountDetails[
                                               "pinswg_contact_associatedlpa@OData.Community.Display.V1.FormattedValue"
                                           ] +
diff --git a/components/myportal/advancedsearch.js b/components/myportal/advancedsearch.js
index c699b893..87d56566 100644
--- a/components/myportal/advancedsearch.js
+++ b/components/myportal/advancedsearch.js
@@ -148,7 +148,7 @@ let AdvancedSearch = (props) => {
                                               {router.locale == "cy"
                                                   ? jsonpath({
                                                         path:
-                                                            '$..[?(@.value=="' +
+                                                            '$..[?(@ && @.value=="' +
                                                             optionsObj[key]
                                                                 .name +
                                                             '")].value_cy',
@@ -253,7 +253,7 @@ let AdvancedSearch = (props) => {
                                                   : router.locale == "cy"
                                                   ? jsonpath({
                                                         path:
-                                                            '$..[?(@.value=="' +
+                                                            '$..[?(@ && @.value=="' +
                                                             optionsObj[key]
                                                                 .value +
                                                             '")].value_cy',
diff --git a/components/myportal/awaitingsubmissionfromblob.js b/components/myportal/awaitingsubmissionfromblob.js
index b327f855..26baf861 100644
--- a/components/myportal/awaitingsubmissionfromblob.js
+++ b/components/myportal/awaitingsubmissionfromblob.js
@@ -204,7 +204,7 @@ const AwaitingSubmissionFromBlob = (props) => {
                                     {router.locale == "cy"
                                         ? jsonpath({
                                               path:
-                                                  '$..[?(@.value=="' +
+                                                  '$..[?(@ && @.value=="' +
                                                   getFormCollectionByID(
                                                       showTopThreeArr[key]
                                                           .pinswg_appealcasetype
@@ -297,7 +297,7 @@ const AwaitingSubmissionFromBlob = (props) => {
                                     {router.locale == "cy"
                                         ? jsonpath({
                                               path:
-                                                  '$..[?(@.value=="' +
+                                                  '$..[?(@ && @.value=="' +
                                                   showTopThreeArr[key][
                                                       "pinswg_lpaname"
                                                   ] +
diff --git a/components/myportal/topthree.js b/components/myportal/topthree.js
index c039c483..9d61d7fc 100644
--- a/components/myportal/topthree.js
+++ b/components/myportal/topthree.js
@@ -328,7 +328,7 @@ const TopThree = (props) => {
                         {router.locale == "cy"
                             ? jsonpath({
                                   path:
-                                      '$..[?(@.value=="' +
+                                      '$..[?(@ && @.value=="' +
                                       showTopThreeArr[key][
                                           "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                       ] +
@@ -400,7 +400,7 @@ const TopThree = (props) => {
                         {router.locale == "cy"
                             ? jsonpath({
                                   path:
-                                      '$..[?(@.value=="' +
+                                      '$..[?(@ && @.value=="' +
                                       showTopThreeArr[key][
                                           "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                       ] +
diff --git a/components/myportal/topthree_reps.js b/components/myportal/topthree_reps.js
index ed48e185..1b9ab569 100644
--- a/components/myportal/topthree_reps.js
+++ b/components/myportal/topthree_reps.js
@@ -271,7 +271,7 @@ const TopThree = (props) => {
                         {router.locale == "cy"
                             ? jsonpath({
                                   path:
-                                      '$..[?(@.value=="' +
+                                      '$..[?(@ && @.value=="' +
                                       showTopThreeArr[key].representationType +
                                       '")].value_cy',
                                   json: transLookup,
@@ -285,7 +285,7 @@ const TopThree = (props) => {
                         {router.locale == "cy"
                             ? jsonpath({
                                   path:
-                                      '$..[?(@.value=="' +
+                                      '$..[?(@ && @.value=="' +
                                       showTopThreeArr[key]
                                           .representationCapacity +
                                       '"  ||@.value_cy=="' +
@@ -297,7 +297,7 @@ const TopThree = (props) => {
                               })
                             : jsonpath({
                                   path:
-                                      '$..[?(@.value_cy=="' +
+                                      '$..[?(@ && @.value_cy=="' +
                                       showTopThreeArr[key]
                                           .representationCapacity +
                                       '")].value',
@@ -306,7 +306,7 @@ const TopThree = (props) => {
                               }).length > 0
                             ? jsonpath({
                                   path:
-                                      '$..[?(@.value_cy=="' +
+                                      '$..[?(@ && @.value_cy=="' +
                                       showTopThreeArr[key]
                                           .representationCapacity +
                                       '")].value',
@@ -327,7 +327,7 @@ const TopThree = (props) => {
                         {router.locale == "cy"
                             ? jsonpath({
                                   path:
-                                      '$..[?(@.value=="' +
+                                      '$..[?(@ && @.value=="' +
                                       showTopThreeArr[key][
                                           "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
                                       ] +
diff --git a/components/myportal/viewall.js b/components/myportal/viewall.js
index e1536b58..249992fb 100644
--- a/components/myportal/viewall.js
+++ b/components/myportal/viewall.js
@@ -118,7 +118,7 @@ const ViewAllResults = (props) => {
                     (currentView.viewKey == "myRepresentations"
                         ? ""
                         : "..value") +
-                    '[?(@.pinswg_name=="' +
+                    '[?(@ && @.pinswg_name=="' +
                     (currentView.viewKey == "awaitingSubmissionDetails"
                         ? item.title
                         : currentView.viewKey == "watchedCases"
@@ -480,7 +480,7 @@ const ViewAllResults = (props) => {
                             ? router.locale == "cy"
                                 ? jsonpath({
                                       path:
-                                          '$..[?(@.value=="' +
+                                          '$..[?(@ && @.value=="' +
                                           resultsArr[key].pinswg_lpaname +
                                           '")].value_cy',
                                       json: transLookup,
@@ -494,7 +494,7 @@ const ViewAllResults = (props) => {
                             ? router.locale == "cy"
                                 ? jsonpath({
                                       path:
-                                          '$..[?(@.value=="' +
+                                          '$..[?(@ && @.value=="' +
                                           resultsArr[key][
                                               "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                           ] +
@@ -512,7 +512,7 @@ const ViewAllResults = (props) => {
                             ? router.locale == "cy"
                                 ? jsonpath({
                                       path:
-                                          '$..[?(@.value=="' +
+                                          '$..[?(@ && @.value=="' +
                                           searchDetailsObj[key].value[0][
                                               "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValuee"
                                           ] +
@@ -532,7 +532,7 @@ const ViewAllResults = (props) => {
                             ? router.locale == "cy"
                                 ? jsonpath({
                                       path:
-                                          '$..[?(@.value=="' +
+                                          '$..[?(@ && @.value=="' +
                                           resultsArr[key][
                                               "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValuee"
                                           ] +
@@ -550,7 +550,7 @@ const ViewAllResults = (props) => {
                               router.locale == "cy" &&
                               jsonpath({
                                   path:
-                                      '$..[?(@.value=="' +
+                                      '$..[?(@ && @.value=="' +
                                       searchDetailsObj[key][
                                           "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
                                       ] +
@@ -568,7 +568,7 @@ const ViewAllResults = (props) => {
                             ? router.locale == "cy"
                                 ? jsonpath({
                                       path:
-                                          '$..[?(@.value=="' +
+                                          '$..[?(@ && @.value=="' +
                                           getFormCollectionByID(
                                               item.pinswg_appealcasetype
                                           ).value +
@@ -582,7 +582,7 @@ const ViewAllResults = (props) => {
                             : router.locale == "cy"
                             ? jsonpath({
                                   path:
-                                      '$..[?(@.value=="' +
+                                      '$..[?(@ && @.value=="' +
                                       item[
                                           "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                       ] +
@@ -601,7 +601,7 @@ const ViewAllResults = (props) => {
                             (router.locale == "cy"
                                 ? jsonpath({
                                       path:
-                                          '$..[?(@.value=="' +
+                                          '$..[?(@ && @.value=="' +
                                           getFormCollectionByID(
                                               searchDetailsObj[key].appealType
                                           ).value +
@@ -629,7 +629,7 @@ const ViewAllResults = (props) => {
                             ? router.locale == "cy"
                                 ? jsonpath({
                                       path:
-                                          '$..[?(@.statuscode=="' +
+                                          '$..[?(@ && @.statuscode=="' +
                                           item.statuscode +
                                           '")].value_cy',
                                       json: transLookup,
@@ -637,7 +637,7 @@ const ViewAllResults = (props) => {
                                   })
                                 : jsonpath({
                                       path:
-                                          '$..[?(@.statuscode=="' +
+                                          '$..[?(@ && @.statuscode=="' +
                                           item.statuscode +
                                           '")].value',
                                       json: transLookup,
@@ -647,7 +647,7 @@ const ViewAllResults = (props) => {
                             ? repRaisedDate(item.repfile_name) // ? router.locale == "cy"
                             : //     ? jsonpath({path:
                             //
-                            //           '$..[?(@.value=="' +
+                            //           '$..[?(@ && @.value=="' +
                             //               searchDetailsObj[key].value[0][
                             //                   "statuscode@OData.Community.Display.V1.FormattedValue"
                             //               ] +
@@ -659,7 +659,7 @@ const ViewAllResults = (props) => {
                             // : router.locale == "cy"
                             // ? jsonpath({path:
                             //
-                            //       '$..[?(@.value=="' +
+                            //       '$..[?(@ && @.value=="' +
                             //           item[
                             //               "statuscode@OData.Community.Display.V1.FormattedValue"
                             //           ] +
@@ -669,7 +669,7 @@ const ViewAllResults = (props) => {
                             router.locale == "cy"
                             ? jsonpath({
                                   path:
-                                      '$..[?(@.value=="' +
+                                      '$..[?(@ && @.value=="' +
                                       item[
                                           "statuscode@OData.Community.Display.V1.FormattedValue"
                                       ] +
diff --git a/components/newappeal/buildcheckrow.js b/components/newappeal/buildcheckrow.js
index 514dab18..3934ed05 100644
--- a/components/newappeal/buildcheckrow.js
+++ b/components/newappeal/buildcheckrow.js
@@ -72,7 +72,7 @@ let BuildCheckRow = (props) => {
         let labelTrans =
             router.locale == "cy"
                 ? jsonpath({
-                      path: '$..[?(@.value=="' + label + '")].value_cy',
+                      path: '$..[?(@ && @.value=="' + label + '")].value_cy',
                       json: formObj,
                       eval: true,
                   })
@@ -103,7 +103,7 @@ let BuildCheckRow = (props) => {
                     var datafieldname = xpath.select("//@datafieldname", doc);
                     const isRequiredField = jsonpath({
                         path:
-                            "$..value[?(@.LogicalName=='" +
+                            "$..value[?(@ && @.LogicalName=='" +
                             datafieldname[0].value +
                             "')]",
                         json: mandatoryFieldsData,
diff --git a/components/newappeal/buildchecksection.js b/components/newappeal/buildchecksection.js
index 40a24ee2..58030988 100644
--- a/components/newappeal/buildchecksection.js
+++ b/components/newappeal/buildchecksection.js
@@ -136,7 +136,7 @@ let BuildCheckSection = (props) => {
         let labelTrans =
             router.locale == "cy"
                 ? jsonpath({
-                      path: '$..[?(@.value=="' + label + '")].value_cy',
+                      path: '$..[?(@ && @.value=="' + label + '")].value_cy',
                       json: formObj,
                       eval: true,
                   })
diff --git a/components/newappeal/buildrow.js b/components/newappeal/buildrow.js
index 8150df40..bb48a1d5 100644
--- a/components/newappeal/buildrow.js
+++ b/components/newappeal/buildrow.js
@@ -111,7 +111,7 @@ export default function BuildRow(props) {
                     dateEnd = !_.isEmpty(dateEnd) && dateEnd[0].value;
 
                     //const isRequiredField = jsonpath({path:
-                    //     "$..value[?(@.LogicalName=='" +
+                    //     "$..value[?(@ && @.LogicalName=='" +
                     //         datafieldname[0].value +
                     //         "')]",
                     //     mandatoryFieldsData
diff --git a/components/newappeal/createCase.js b/components/newappeal/createCase.js
index 73d9d36c..b7b29e07 100644
--- a/components/newappeal/createCase.js
+++ b/components/newappeal/createCase.js
@@ -67,7 +67,7 @@ const RenderLPAList = ({
                                           {router.locale == "cy"
                                               ? jsonpath({
                                                     path:
-                                                        '$..[?(@.value=="' +
+                                                        '$..[?(@ && @.value=="' +
                                                         optionsObj[key].name +
                                                         '")].value_cy',
                                                     json: transLookup,
@@ -151,7 +151,7 @@ const RenderAppealTypeList = ({
                                               : router.locale == "cy"
                                               ? jsonpath({
                                                     path:
-                                                        '$..[?(@.value=="' +
+                                                        '$..[?(@ && @.value=="' +
                                                         optionsObj[key].value +
                                                         '")].value_cy',
                                                     json: transLookup,
diff --git a/components/pdftemplates/appealRow_pdf.js b/components/pdftemplates/appealRow_pdf.js
index e1f73319..06609d61 100644
--- a/components/pdftemplates/appealRow_pdf.js
+++ b/components/pdftemplates/appealRow_pdf.js
@@ -395,7 +395,7 @@ export const AppealRow_pdf = (props) => {
                                     break;
                                 case "{16D63FD6-119B-4353-BDCA-18358721C3FE}":
                                     // const blobList = jsonpath({path:
-                                    //     "$..[?(@.documentType=='" +
+                                    //     "$..[?(@ && @.documentType=='" +
                                     //         documentTypeCode[0].value +
                                     //         "')]",
                                     //     props.filesList
diff --git a/components/search/addresssearchresults.js b/components/search/addresssearchresults.js
index c1f28c16..51fb4479 100644
--- a/components/search/addresssearchresults.js
+++ b/components/search/addresssearchresults.js
@@ -97,7 +97,7 @@ const SearchResults = (props) => {
     const isWatchedCase = (whichIncident) => {
         let isWatched = jsonpath({
             path:
-                "$..value[?(@._pinswg_watchedcase_value=='" +
+                "$..value[?(@ && @._pinswg_watchedcase_value=='" +
                 whichIncident +
                 "')]",
             json: watchedCases,
@@ -247,7 +247,7 @@ const SearchResults = (props) => {
                         resultsArrPaged.map((item, key) => {
                             let detailsObj = jsonpath({
                                 path:
-                                    '$..value[?(@.pinswg_name=="' +
+                                    '$..value[?(@ && @.pinswg_name=="' +
                                     item.pinswg_name +
                                     '")]',
 
@@ -462,7 +462,7 @@ const SearchResults = (props) => {
                                             ? router.locale == "cy"
                                                 ? jsonpath({
                                                       path:
-                                                          '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           item[
                                                               "_pinswg_localplanningauthority_value@OData.Community.Display.V1.FormattedValue"
                                                           ] +
@@ -480,7 +480,7 @@ const SearchResults = (props) => {
                                             ? router.locale == "cy"
                                                 ? jsonpath({
                                                       path:
-                                                          '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           item[
                                                               "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                           ] +
@@ -503,7 +503,7 @@ const SearchResults = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       item[
                                                           "pinswg_appealType"
                                                       ] +
@@ -525,7 +525,7 @@ const SearchResults = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       item[
                                                           "statuscode@OData.Community.Display.V1.FormattedValue"
                                                       ] +
diff --git a/components/search/advancedsearch.js b/components/search/advancedsearch.js
index 13237263..d5bf3cc4 100644
--- a/components/search/advancedsearch.js
+++ b/components/search/advancedsearch.js
@@ -128,7 +128,7 @@ const RenderCaseStatusList = ({
                                               : router.locale == "cy"
                                               ? jsonpath({
                                                     path:
-                                                        '$..[?(@.statuscode=="' +
+                                                        '$..[?(@ && @.statuscode=="' +
                                                         optionsObj[key]
                                                             .statuscode +
                                                         '")].value_cy',
@@ -243,7 +243,7 @@ let AdvancedSearch = (props) => {
                                               {router.locale == "cy"
                                                   ? jsonpath({
                                                         path:
-                                                            '$..[?(@.value=="' +
+                                                            '$..[?(@ && @.value=="' +
                                                             optionsObj[key]
                                                                 .name +
                                                             '")].value_cy',
@@ -348,7 +348,7 @@ let AdvancedSearch = (props) => {
                                                   : router.locale == "cy"
                                                   ? jsonpath({
                                                         path:
-                                                            '$..[?(@.value=="' +
+                                                            '$..[?(@ && @.value=="' +
                                                             optionsObj[key]
                                                                 .value +
                                                             '")].value_cy',
diff --git a/components/search/dnssearchresults.js b/components/search/dnssearchresults.js
index 135910ab..787f5c91 100644
--- a/components/search/dnssearchresults.js
+++ b/components/search/dnssearchresults.js
@@ -170,7 +170,7 @@ const DNSSearchResults = (props) => {
     const isWatchedCase = (whichIncident) => {
         let isWatched = jsonpath({
             path:
-                "$..value[?(@._pinswg_watchedcase_value=='" +
+                "$..value[?(@ && @._pinswg_watchedcase_value=='" +
                 whichIncident +
                 "')]",
             json: watchedCases,
@@ -299,7 +299,7 @@ const DNSSearchResults = (props) => {
                             resultsArr.map((item, key) => {
                                 let detailsObj = jsonpath({
                                     path:
-                                        '$..value[?(@.pinswg_name=="' +
+                                        '$..value[?(@ && @.pinswg_name=="' +
                                         item.title +
                                         '")]',
                                     json: searchDetailsObj,
@@ -460,7 +460,7 @@ const DNSSearchResults = (props) => {
                                                 ? router.locale == "cy"
                                                     ? jsonpath({
                                                           path:
-                                                              '$..[?(@.value=="' +
+                                                              '$..[?(@ && @.value=="' +
                                                               detailsObj[
                                                                   "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                               ] +
@@ -484,7 +484,7 @@ const DNSSearchResults = (props) => {
                                             {router.locale == "cy"
                                                 ? jsonpath({
                                                       path:
-                                                          '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           item[
                                                               "statuscode@OData.Community.Display.V1.FormattedValue"
                                                           ] +
diff --git a/components/search/searchresults.js b/components/search/searchresults.js
index ccef381b..51a0d645 100644
--- a/components/search/searchresults.js
+++ b/components/search/searchresults.js
@@ -103,7 +103,7 @@ const SearchResults = (props) => {
     const isWatchedCase = (whichIncident) => {
         let isWatched = jsonpath({
             path:
-                "$..value[?(@._pinswg_watchedcase_value=='" +
+                "$..value[?(@ && @._pinswg_watchedcase_value=='" +
                 whichIncident +
                 "')]",
 
@@ -244,7 +244,7 @@ const SearchResults = (props) => {
                         resultsArr.map((item, key) => {
                             let detailsObj = jsonpath({
                                 path:
-                                    '$..value[?(@.pinswg_name=="' +
+                                    '$..value[?(@ && @.pinswg_name=="' +
                                     item.title +
                                     '")]',
                                 json: searchDetailsObj,
@@ -439,7 +439,7 @@ const SearchResults = (props) => {
                                             ? router.locale == "cy"
                                                 ? jsonpath({
                                                       path:
-                                                          '$..[?(@.value=="' +
+                                                          '$..[?(@ && @.value=="' +
                                                           item[
                                                               "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
                                                           ] +
@@ -462,7 +462,7 @@ const SearchResults = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       item[
                                                           "pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
                                                       ] +
@@ -485,7 +485,7 @@ const SearchResults = (props) => {
                                         {router.locale == "cy"
                                             ? jsonpath({
                                                   path:
-                                                      '$..[?(@.value=="' +
+                                                      '$..[?(@ && @.value=="' +
                                                       item[
                                                           "statuscode@OData.Community.Display.V1.FormattedValue"
                                                       ] +
diff --git a/components/utils/index.js b/components/utils/index.js
index a8423d1e..041b12c4 100644
--- a/components/utils/index.js
+++ b/components/utils/index.js
@@ -18,7 +18,7 @@ import xpath from "xpath";
  */
 export const getFormCollection = (formtype) => {
     const collectionName = jsonpath({
-        path: "$..[?(@.LogicalName=='" + formtype + "')]",
+        path: "$..[?(@ && @.LogicalName=='" + formtype + "')]",
         json: data,
         eval: true,
     });
@@ -27,7 +27,7 @@ export const getFormCollection = (formtype) => {
 
 export const getFormCollectionByID = (appealTypeID) => {
     const collectionName = jsonpath({
-        path: "$..[?(@.appealTypeID =='" + appealTypeID + "')]",
+        path: "$..[?(@ && @.appealTypeID =='" + appealTypeID + "')]",
         json: data,
         eval: true,
     });
@@ -36,7 +36,7 @@ export const getFormCollectionByID = (appealTypeID) => {
 
 export const getFormIDByLogicalName = (appealTypeLogicalName) => {
     const collectionName = jsonpath({
-        path: "$..[?(@.LogicalName =='" + appealTypeLogicalName + "')]",
+        path: "$..[?(@ && @.LogicalName =='" + appealTypeLogicalName + "')]",
         json: data,
         eval: true,
     });
@@ -45,14 +45,14 @@ export const getFormIDByLogicalName = (appealTypeLogicalName) => {
 
 export const getPickListLabel = (data, picklistType, picklistID) => {
     const pickListData = jsonpath({
-        path: "$..[?(@.LogicalName=='" + picklistType + "')]",
+        path: "$..[?(@ && @.LogicalName=='" + picklistType + "')]",
         json: data,
         eval: true,
     });
 
     const pickListLabel = jsonpath({
         path:
-            "$..[?(@.Value=='" +
+            "$..[?(@ && @.Value=='" +
             picklistID +
             "')].Label.LocalizedLabels..Label",
 
@@ -64,14 +64,14 @@ export const getPickListLabel = (data, picklistType, picklistID) => {
 
 export const getRadioLabel = (data, radiotListName, radioListID) => {
     const radioListData = jsonpath({
-        path: "$..[?(@.LogicalName=='" + radiotListName + "')]",
+        path: "$..[?(@ && @.LogicalName=='" + radiotListName + "')]",
         json: data,
         eval: true,
     });
 
     const pickListLabel = jsonpath({
         path:
-            "$..[?(@.Value=='" +
+            "$..[?(@ && @.Value=='" +
             radioListID +
             "')].Label.LocalizedLabels..Label",
 
@@ -336,7 +336,7 @@ export const getProgressObj = (
 
                 const isRequiredField = jsonpath({
                     path:
-                        "$..value[?(@.LogicalName=='" +
+                        "$..value[?(@ && @.LogicalName=='" +
                         datafieldname[0].value +
                         "')]",
                     json: mandatoryFieldsData,
diff --git a/pages/api/endpoint/getmylpacases_api.js b/pages/api/endpoint/getmylpacases_api.js
index 7967ef2f..f1bb809c 100644
--- a/pages/api/endpoint/getmylpacases_api.js
+++ b/pages/api/endpoint/getmylpacases_api.js
@@ -49,13 +49,13 @@ export default async function ApiProxy(req, res) {
     const lpaList = await getLPA();
 
     const lpaGUID = jsonpath({
-        path: '$..[?(@.name=="' + lpaid + '")]',
+        path: '$..[?(@ && @.name=="' + lpaid + '")]',
         json: lpaList,
         eval: true,
     });
 
     //console.log(
-    //     '$..[?(@.name="' + lpaid + '")]',
+    //     '$..[?(@ && @.name="' + lpaid + '")]',
     //     lpaList,
     //     lpaid,
     //     "LPAGUID=",
diff --git a/pages/myportal/[appealtypes].js b/pages/myportal/[appealtypes].js
index 0a705538..950c7e41 100644
--- a/pages/myportal/[appealtypes].js
+++ b/pages/myportal/[appealtypes].js
@@ -77,7 +77,7 @@ let Home = (props) => {
     let optionsStr = props.appealType.appealTypeOptions.value || {};
 
     let selectedObj = jsonpath({
-        path: "$..[?(@.attributevalue=='" + router.query.apt + "')]",
+        path: "$..[?(@ && @.attributevalue=='" + router.query.apt + "')]",
         json: optionsStr,
         eval: true,
     });
diff --git a/pages/newappeal/[appealtypes].js b/pages/newappeal/[appealtypes].js
index a9ebe6ea..0878d677 100644
--- a/pages/newappeal/[appealtypes].js
+++ b/pages/newappeal/[appealtypes].js
@@ -69,7 +69,7 @@ let Home = (props) => {
     let optionsStr = props.appealType.appealTypeOptions.value;
 
     let selectedObj = jsonpath({
-        path: "$..[?(@.attributevalue=='" + router.query.apt + "')]",
+        path: "$..[?(@ && @.attributevalue=='" + router.query.apt + "')]",
         json: optionsStr,
         eval: true,
     });