diff --git a/components/case/representation/index.js b/components/case/representation/index.js
index 957783b8..f4d482bd 100644
--- a/components/case/representation/index.js
+++ b/components/case/representation/index.js
@@ -887,6 +887,13 @@ let MakeRepresentation = (props) => {
         window.scrollTo({ top: 0, behavior: "smooth" });
         values = setRepFileName(values);
 
+        !values.hasOwnProperty("pinswg_lpareference") &&
+            Object.assign(values, {
+                "pinswg_lpareference":
+                    searchResultsObj.searchResultsObj.value[0]
+                        .pinswg_lpareference,
+            });
+
         //console.log("onHandleSubmit form values - ", JSON.stringify(values));
 
         const buildFileArray = [];
@@ -1196,7 +1203,9 @@ let MakeRepresentation = (props) => {
                         setShowQuestionnaireSection={
                             setShowQuestionnaireSection
                         }
+                        showQuestionnaireSection={showQuestionnaireSection}
                         props={props}
+                        questionnaireCount={questionnaireCount}
                     />
                 ) : (
                     <>
diff --git a/components/pdftemplates/lpaQuestionnaire_pdf.js b/components/pdftemplates/lpaQuestionnaire_pdf.js
index 24e2af95..d86ee469 100644
--- a/components/pdftemplates/lpaQuestionnaire_pdf.js
+++ b/components/pdftemplates/lpaQuestionnaire_pdf.js
@@ -203,7 +203,7 @@ export const lpaQuestionnaire_pdf = ({ docProps }) => {
                                     )}
                                 </Text>
                                 <Text style={styles.questionAnswer}>
-                                    {values.lpaRef || " "}
+                                    {values.pinswg_lpareference || " "}
                                 </Text>
                             </View>
                             <View