diff --git a/ipi-survey-platform/src/components/survey/EstablishmentInfo/EstablishmentInfo.jsx b/ipi-survey-platform/src/components/survey/EstablishmentInfo/EstablishmentInfo.jsx
index fde278e..c020fc5 100644
--- a/ipi-survey-platform/src/components/survey/EstablishmentInfo/EstablishmentInfo.jsx
+++ b/ipi-survey-platform/src/components/survey/EstablishmentInfo/EstablishmentInfo.jsx
@@ -146,6 +146,8 @@ const EstablishmentInfo = ({
         endDate: data.end_date || ''
       };
       localStorage.setItem('currentSurveyPeriod', JSON.stringify(surveyPeriod));
+      localStorage.setItem('currentQuarter', data.quarter);  // Store quarter separately
+      localStorage.setItem('currentYear', data.year);    
       return surveyPeriod;
     }
    
@@ -154,6 +156,8 @@ const EstablishmentInfo = ({
       const { quarter, year, endDate } = location.state.survey;
       const surveyPeriod = { quarter, year, endDate };
       localStorage.setItem('currentSurveyPeriod', JSON.stringify(surveyPeriod));
+      localStorage.setItem('currentQuarter', quarter);  // Store quarter separately
+      localStorage.setItem('currentYear', year);        // Store year separately
       return surveyPeriod;
     }
    
@@ -394,7 +398,7 @@ const EstablishmentInfo = ({
                           day: 'numeric'
                         })
                       ) : (
-                        <span className="text-amber-600">To be announced</span>
+                        <span className="text-amber-600">-</span>
                       )}
                     </span>
                     </div>
diff --git a/ipi-survey-platform/src/components/survey/ProductData/ProductData.jsx b/ipi-survey-platform/src/components/survey/ProductData/ProductData.jsx
index 06e3282..baf4b1e 100644
--- a/ipi-survey-platform/src/components/survey/ProductData/ProductData.jsx
+++ b/ipi-survey-platform/src/components/survey/ProductData/ProductData.jsx
@@ -1211,7 +1211,7 @@ const location = useLocation();
                     day: 'numeric'
                   })
                 ) : (
-                  <span className="text-amber-600">To be announced</span>
+                  <span className="text-amber-600">-</span>
                 );
               })()}
             </div>
diff --git a/ipi-survey-platform/src/components/survey/ReviewSubmit/ReviewSubmit.jsx b/ipi-survey-platform/src/components/survey/ReviewSubmit/ReviewSubmit.jsx
index db339ad..5cfd7ab 100644
--- a/ipi-survey-platform/src/components/survey/ReviewSubmit/ReviewSubmit.jsx
+++ b/ipi-survey-platform/src/components/survey/ReviewSubmit/ReviewSubmit.jsx
@@ -351,15 +351,17 @@ const ReviewSubmit = ({
     const fetchQuarterPeriods = async () => {
       try {
         setIsLoading(true);
-        const savedSurveyPeriod = localStorage.getItem('currentSurveyPeriod');
-        if (!savedSurveyPeriod) {
-          throw new Error('No survey period found in localStorage');
-        }
+        // const savedSurveyPeriod = localStorage.getItem('currentSurveyPeriod');
+        // if (!savedSurveyPeriod) {
+        //   throw new Error('No survey period found in localStorage');
+        // }
         
-        const { quarter, year } = JSON.parse(savedSurveyPeriod);
-        if (!quarter || !year) {
-          throw new Error('Incomplete survey period data');
-        }
+        // const { quarter, year } = JSON.parse(savedSurveyPeriod);
+        // if (!quarter || !year) {
+        //   throw new Error('Incomplete survey period data');
+        // }
+        const quarter = localStorage.getItem('currentQuarter');
+        const year = localStorage.getItem('currentYear');
 
         const response = await getQuarterPeriods(year, quarter);
         if (response.status === 'success') {