diff --git a/.env.local b/.env.local
index d90469ca..75910c4f 100644
--- a/.env.local
+++ b/.env.local
@@ -34,11 +34,11 @@ RELAYPATH = "ar-hc-lz-pedw-dev-uks-01"
 //RELAYPATH = "test-pedw-hc"
 
 //New Test  
-# CLIENT_ID = d40b9373-96c2-4b04-8bd8-c2a2fe6444c1
-# CLIENT_SECRET = 6hT8Q~glL~jloWpGmvXw3UY37QFwjUE0r._jobEM
-# RELAY_ROOT = https://ar-ns-lz-pedw-test-uks-01.servicebus.windows.net/ar-hc-lz-pedw-test-uks-01/  
-# RELAYURI = "ar-ns-lz-pedw-test-uks-01.servicebus.windows.net"
-# RELAYPATH = "ar-hc-lz-pedw-test-uks-01"
+CLIENT_ID = d40b9373-96c2-4b04-8bd8-c2a2fe6444c1
+CLIENT_SECRET = 6hT8Q~glL~jloWpGmvXw3UY37QFwjUE0r._jobEM
+RELAY_ROOT = https://ar-ns-lz-pedw-test-uks-01.servicebus.windows.net/ar-hc-lz-pedw-test-uks-01/  
+RELAYURI = "ar-ns-lz-pedw-test-uks-01.servicebus.windows.net"
+RELAYPATH = "ar-hc-lz-pedw-test-uks-01"
 
 
 //Preprod Oauth WGO 
@@ -128,10 +128,10 @@ AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwdevuks.blob.core.windows.net
 //AZURE_STORAGE_ACCOUNT_KEY = iEQKwh4TB9BT63pU5a6+ivn6ItiDkuIkYCrUwjm9STJTdMBOKWUT06EEcP8pcy/qeQ89ogK75mFQ+AStT53G/g==
 //AZURE_PEDW_STORAGE_ENDPOINT = https://pedwtest.blob.core.windows.net
 
-# // New test key
-# AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwtestuks"
-# AZURE_STORAGE_ACCOUNT_KEY = bqJAz5pYQVGee8dnVhlsqW+xHwinNTjgY2AmojNyB+d4uAotMR20WcO4Op13yB+9dFaXAkkjtIA4+AStHT/IYg==
-# AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwtestuks.blob.core.windows.net
+// New test key
+AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwtestuks"
+AZURE_STORAGE_ACCOUNT_KEY = bqJAz5pYQVGee8dnVhlsqW+xHwinNTjgY2AmojNyB+d4uAotMR20WcO4Op13yB+9dFaXAkkjtIA4+AStHT/IYg==
+AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwtestuks.blob.core.windows.net
 
 
 // preprod key
diff --git a/components/case/summary.js b/components/case/summary.js
index 39a7888d..44771adb 100644
--- a/components/case/summary.js
+++ b/components/case/summary.js
@@ -682,10 +682,14 @@ const CaseSummary = (props) => {
                                             {t(
                                                 "case:representation-period-ended-on-label"
                                             )}
-
-                                            {formatDates(
-                                                detailsObj.pinswg_finalcommentsduedate
-                                            )}
+                                            {props.currentView.caseReference
+                                                .appealType == 846040019
+                                                ? formatDates(
+                                                      detailsObj.pinswg_statementduedate
+                                                  )
+                                                : formatDates(
+                                                      detailsObj.pinswg_finalcommentsduedate
+                                                  )}
                                         </div>
                                     )}
                             </div>
diff --git a/pages/api/endpoint/getadvancedsearch_api.js b/pages/api/endpoint/getadvancedsearch_api.js
index ec6594e9..3ee38d9b 100644
--- a/pages/api/endpoint/getadvancedsearch_api.js
+++ b/pages/api/endpoint/getadvancedsearch_api.js
@@ -54,14 +54,12 @@ export default async function ApiProxy(req, res) {
 
     var queryString = "";
 
-    searchString.q = searchString.q.replace(/\'/g, "''");
-
     queryString +=
         _.has(searchString, "q") && searchString.q != null
             ? "(contains(title, '" +
-              searchString.q +
+              searchString.q.replace(/\'/g, "''") +
               "') or contains(ticketnumber,'" +
-              searchString.q +
+              searchString.q.replace(/\'/g, "''") +
               "')) and"
             : "";
 
diff --git a/pages/api/endpoint/getadvancedsearchpaged_api.js b/pages/api/endpoint/getadvancedsearchpaged_api.js
index 3a3c293d..348c2cbf 100644
--- a/pages/api/endpoint/getadvancedsearchpaged_api.js
+++ b/pages/api/endpoint/getadvancedsearchpaged_api.js
@@ -89,14 +89,12 @@ export default async function ApiProxy(req, res) {
 
     var queryString = "";
 
-    searchString.q = searchString.q.replace(/\'/g, "''");
-
     queryString +=
         _.has(searchString, "q") && searchString.q != null
             ? "(contains(title, '" +
-              searchString.q +
+              searchString.q.replace(/\'/g, "''") +
               "') or contains(ticketnumber,'" +
-              searchString.q +
+              searchString.q.replace(/\'/g, "''") +
               "')) and"
             : "";