diff --git a/components/case/representation/index.js b/components/case/representation/index.js
index 86592ec7..d1aacc28 100644
--- a/components/case/representation/index.js
+++ b/components/case/representation/index.js
@@ -160,9 +160,15 @@ let MakeRepresentation = (props) => {
                       "_-_" +
                       repType +
                       "_-_" +
-                      values.lastname +
+                      values.lastname.replace(
+                          /[\s~`!@#$%^&*(){}\[\];:"'<,.>?\/\\|_+=-]/g,
+                          ""
+                      ) +
                       "_" +
-                      values.firstname,
+                      values.firstname.replace(
+                          /[\s~`!@#$%^&*(){}\[\];:"'<,.>?\/\\|_+=-]/g,
+                          ""
+                      ),
             });
         }
 
diff --git a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js
index dee483b7..740ce177 100644
--- a/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js
+++ b/components/case/representation/representationQuestionnaires/representationLPAQuestionnaire_enforcement.js
@@ -1117,10 +1117,14 @@ let Enforcement_Questionnaire = (props) => {
                             label={t("myrepresentations:add-files-label")}
                             ticketnumber={props.props.caseReference}
                             hint={"sdsd"}
-                            fileList={[]}
+                            fileList={
+                                props.props.props.props.form[
+                                    "representationForm"
+                                ].values.filesList || []
+                            }
                             setFilesForRepresentation={[]}
                             containerID={props.containerID}
-                            filenamePrefix={props}
+                            filenamePrefix={props.props}
                         />
                     </div>
                 </fieldset>
diff --git a/components/newappeal/buildchecksection.js b/components/newappeal/buildchecksection.js
index 195bfcac..38394681 100644
--- a/components/newappeal/buildchecksection.js
+++ b/components/newappeal/buildchecksection.js
@@ -76,31 +76,30 @@ let BuildCheckSection = (props) => {
     let buildAppealFilesArray = [];
     //console.log("attached docs: - ", buildAppealFilesArray);
 
-    let filesUploadObj = Object.keys(props.props.form.appealForm.values)
-        .filter(function (k) {
-            return k.indexOf("pinswg_fileUpload") == 0;
-        })
-        .reduce(function (newData, k) {
-            newData[k] = props.props.form.appealForm.values[k];
-            return newData;
-        }, {});
+    // let filesUploadObj = Object.keys(props.props.form.appealForm.values)
+    //     .filter(function (k) {
+    //         return k.indexOf("pinswg_fileUpload") == 0;
+    //     })
+    //     .reduce(function (newData, k) {
+    //         newData[k] = props.props.form.appealForm.values[k];
+    //         return newData;
+    //     }, {});
 
-    for (let key in filesUploadObj) {
-        for (let j in filesUploadObj[key]) {
-            typeof filesUploadObj[key][j].name != "undefined" &&
-                buildAppealFilesArray.push({
-                    "name": filesUploadObj[key][j].name,
-                    "size": filesUploadObj[key][j].size,
-                });
-        }
-    }
+    // for (let key in filesUploadObj) {
+    //     for (let j in filesUploadObj[key]) {
+    //         typeof filesUploadObj[key][j].name != "undefined" &&
+    //             buildAppealFilesArray.push({
+    //                 "name": filesUploadObj[key][j].name,
+    //                 "size": filesUploadObj[key][j].size,
+    //             });
+    //     }
+    // }
 
-    props.props.form.appealForm.values.filesList.hasOwnProperty("value")
-        ? (buildAppealFilesArray = buildAppealFilesArray.concat(
-              props.props.form.appealForm.values.filesList.value[0]
-          ))
-        : (buildAppealFilesArray = buildAppealFilesArray.filesList);
+    buildAppealFilesArray = props.props.form.appealForm.values.filesList;
 
+    buildAppealFilesArray.filter(function (item, idx) {
+        return item.name;
+    });
     console.log(buildAppealFilesArray);
 
     let pdfObj = props.props.form.appealForm.values;
@@ -180,52 +179,50 @@ let BuildCheckSection = (props) => {
                         {buildAppealFilesArray.length > 0
                             ? buildAppealFilesArray.map((blob, i) => {
                                   return (
-                                      <>
-                                          <div
-                                              className="govuk-summary-list__row"
-                                              key={"9999"}
-                                          >
-                                              <dt className="govuk-summary-list__key  govuk-!-padding-left-5">
-                                                  <div
-                                                      key={blob.name + "_" + i}
-                                                      className="govuk-!-margin-bottom-5 fileThumb "
-                                                  >
-                                                      <img
-                                                          src={getThumbnailIconByExtension(
-                                                              blob.name
-                                                          )}
-                                                          alt={blob.name}
-                                                          width="50"
-                                                      />
-                                                  </div>
-                                              </dt>
-                                              <dt className="govuk-summary-list__value">
-                                                  <span className="govuk-body govuk-!-font-size-14">
-                                                      {blob.name} (
-                                                      {bytesToSize(
-                                                          blob.size ||
-                                                              blob.contentLength
+                                      <div
+                                          className="govuk-summary-list__row"
+                                          key={i}
+                                      >
+                                          <dt className="govuk-summary-list__key  govuk-!-padding-left-5">
+                                              <div
+                                                  key={blob.name + "_" + i}
+                                                  className="govuk-!-margin-bottom-5 fileThumb "
+                                              >
+                                                  <img
+                                                      src={getThumbnailIconByExtension(
+                                                          blob.name
                                                       )}
-                                                      )
-                                                  </span>
-                                              </dt>
-                                              <dd className="govuk-summary-list__actions">
-                                                  <a
-                                                      className="govuk-link"
-                                                      href="#"
-                                                      onClick={() => {
-                                                          updateCurrentSection(
-                                                              sectionCount
-                                                          );
-                                                      }}
-                                                  >
-                                                      {t(
-                                                          "newappeal:change-link-label"
-                                                      )}
-                                                  </a>
-                                              </dd>
-                                          </div>
-                                      </>
+                                                      alt={blob.name}
+                                                      width="50"
+                                                  />
+                                              </div>
+                                          </dt>
+                                          <dt className="govuk-summary-list__value">
+                                              <span className="govuk-body govuk-!-font-size-14">
+                                                  {blob.name} (
+                                                  {bytesToSize(
+                                                      blob.size ||
+                                                          blob.contentLength
+                                                  )}
+                                                  )
+                                              </span>
+                                          </dt>
+                                          <dd className="govuk-summary-list__actions">
+                                              <a
+                                                  className="govuk-link"
+                                                  href="#"
+                                                  onClick={() => {
+                                                      updateCurrentSection(
+                                                          sectionCount
+                                                      );
+                                                  }}
+                                              >
+                                                  {t(
+                                                      "newappeal:change-link-label"
+                                                  )}
+                                              </a>
+                                          </dd>
+                                      </div>
                                   );
                               })
                             : ""}
diff --git a/components/newappeal/buildsection.js b/components/newappeal/buildsection.js
index bc92e2ff..0cb6c0dd 100644
--- a/components/newappeal/buildsection.js
+++ b/components/newappeal/buildsection.js
@@ -154,15 +154,22 @@ let BuildSection = (props) => {
 
         for (let key in filesUploadObj) {
             for (let j in filesUploadObj[key]) {
-                buildAppealFilesArray.push({
-                    "name": filesUploadObj[key][j].name,
-                    "size": filesUploadObj[key][j].size,
-                });
+                typeof filesUploadObj[key][j].name != "undefined" &&
+                    buildAppealFilesArray.push({
+                        "name": filesUploadObj[key][j].name,
+                        "size": filesUploadObj[key][j].size,
+                    });
             }
         }
 
         console.log(buildAppealFilesArray);
 
+        buildAppealFilesArray = buildAppealFilesArray.concat(values.filesList);
+
+        buildAppealFilesArray.filter(function (item, idx) {
+            return item.name;
+        });
+
         Object.assign(values, { "filesList": buildAppealFilesArray });
 
         setSavingStatus(useSaveStatus);