diff --git a/actions/selectQueryTypes.js b/actions/selectQueryTypes.js
index 80ed95a4..f8e6681f 100644
--- a/actions/selectQueryTypes.js
+++ b/actions/selectQueryTypes.js
@@ -1,7 +1,7 @@
 export const getSelectQuery = (appealTypeName) => {
     switch (appealTypeName) {
         case "pinswg_advertses":
-            return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_procedure,pinswg_questionnaireduedate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent";
+            return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_procedure,pinswg_questionnaireduedate,statuscode,pinswg_startdateoftheevent,pinswg_typeofevent,pinswg_startdate,pinswg_otherpartiesstatement,pinswg_finalcommentsduedate,pinswg_proofsofevidencewrittenstatementsofeviden";
             break;
         case "pinswg_callinss77s":
             return "&$select=modifiedon,_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_startdate,statuscode,pinswg_dateexportedtoiss,pinswg_startdateofevent,pinswg_typeofevent";
diff --git a/components/case/representation/index.js b/components/case/representation/index.js
index 97d23ad5..ba15bca5 100644
--- a/components/case/representation/index.js
+++ b/components/case/representation/index.js
@@ -594,6 +594,7 @@ let MakeRepresentation = (props) => {
             "returnLink": "",
             "linkExpiry": 10 * 60,
         };
+
         props.currentView.representationSubmit == "true"
             ? (sendSavedEmail == true &&
                   sendEmail(
@@ -608,8 +609,8 @@ let MakeRepresentation = (props) => {
                           ? router.locale + "/myportal"
                           : "/myportal"
                   ))
-            : useSaveStatus &&
-              (values.hasOwnProperty("representationDocuments") &&
+            : useSaveStatus
+            ? (values.hasOwnProperty("representationDocuments") &&
                   (values.representationDocuments.map((Blob) =>
                       buildFileArray.push({
                           "name": Blob.name,
@@ -629,6 +630,22 @@ let MakeRepresentation = (props) => {
                   router.locale != "en"
                       ? router.locale + "/myportal"
                       : "/myportal"
+              ))
+            : (values.hasOwnProperty("representationDocuments") &&
+                  (values.representationDocuments.map((Blob) =>
+                      buildFileArray.push({
+                          "name": Blob.name,
+                          "size": Blob.size,
+                      })
+                  ),
+                  Object.assign(values, {
+                      "filesList": buildFileArray,
+                  })),
+              uploadRepresentationFiles(values),
+              generateRepPDF(
+                  values,
+                  props.props.accountDetails.containerID,
+                  currentView.caseReference.currentReference
               ));
     };
 
diff --git a/components/case/representation/representationCompleteSubmit.js b/components/case/representation/representationCompleteSubmit.js
index 13b3793b..17d90c7b 100644
--- a/components/case/representation/representationCompleteSubmit.js
+++ b/components/case/representation/representationCompleteSubmit.js
@@ -99,6 +99,14 @@ const RepCompleteSubmit = (props) => {
         {
             switch (currentView.caseReference.appealType) {
                 case 846040000:
+                case 846040001:
+                case 846040006:
+                case 846040025:
+                case 846040004:
+                case 846040018:
+                case 846040003:
+                case 846040009:
+                case 846040008:
                     return (
                         <RepLPAQuestionnaireCheck_s78
                             props={props}
@@ -107,8 +115,9 @@ const RepCompleteSubmit = (props) => {
                         />
                     );
                     break;
-
                 case 846040005:
+                case 846040006:
+                case 846040007:
                     return (
                         <RepLPAQuestionnaireCheck_enforcement
                             props={props}