diff --git a/ipi-survey-platform/src/pages/Admin/configuration/CompanyProfile.jsx b/ipi-survey-platform/src/pages/Admin/configuration/CompanyProfile.jsx
index d0518c4..1043311 100644
--- a/ipi-survey-platform/src/pages/Admin/configuration/CompanyProfile.jsx
+++ b/ipi-survey-platform/src/pages/Admin/configuration/CompanyProfile.jsx
@@ -2918,12 +2918,12 @@ const handleView = async (id) => {
           corporate_mobile_number: form.corporateMobileNumber || '',
           corporate_email: form.corporateEmail || '',
           corporate_website: form.corporateWebsite || '',
-          emirati_male: Number(form.employmentEmiratiMale) || '',
-          emirati_female: Number(form.employmentEmiratiFemale) || '',
-          non_emirati_male: Number(form.employmentNonEmiratiMale) || '',
-          non_emirati_female: Number(form.employmentNonEmiratiFemale) || '',
-          total_emirati: Number(totalEmirati) || '',
-          total_employees: Number(employmentTotals) || '',
+          emirati_male: form.employmentEmiratiMale === '' ? '' : Number(form.employmentEmiratiMale),
+          emirati_female: form.employmentEmiratiFemale === '' ? '' : Number(form.employmentEmiratiFemale),
+          non_emirati_male: form.employmentNonEmiratiMale === '' ? '' : Number(form.employmentNonEmiratiMale),
+          non_emirati_female: form.employmentNonEmiratiFemale === '' ? '' : Number(form.employmentNonEmiratiFemale),
+          total_emirati: form.totalEmirati === '' ? 0 : (Number(form.employmentEmiratiMale) || 0) + (Number(form.employmentEmiratiFemale) || 0),
+          total_employees: form.employmentTotalEmployees === '' ? 0 : Number(form.employmentTotalEmployees)|| 0,
           created_by: currentUserId?.id,
           created_by_name: currentUserId?.name, 
           establishment_user: {
@@ -3029,12 +3029,12 @@ const handleView = async (id) => {
           corporate_mobile_number: form.corporateMobileNumber || '',
           corporate_email: form.corporateEmail || '',
           corporate_website: form.corporateWebsite || '',
-          emirati_male: Number(form.employmentEmiratiMale) || '',
-          emirati_female: Number(form.employmentEmiratiFemale) || 'null',
-          non_emirati_male: Number(form.employmentNonEmiratiMale) || '',
-          non_emirati_female: Number(form.employmentNonEmiratiFemale) || '',
-          total_emirati: (Number(form.employmentEmiratiMale) || '') + (Number(form.employmentEmiratiFemale) || ''),
-          total_employees: Number(form.employmentTotalEmployees) || '',
+          emirati_male: form.employmentEmiratiMale === '' ? '' : Number(form.employmentEmiratiMale),
+          emirati_female: form.employmentEmiratiFemale === '' ? '' : Number(form.employmentEmiratiFemale),
+          non_emirati_male: form.employmentNonEmiratiMale === '' ? '' : Number(form.employmentNonEmiratiMale),
+          non_emirati_female: form.employmentNonEmiratiFemale === '' ? '' : Number(form.employmentNonEmiratiFemale),
+          total_emirati: form.totalEmirati === '' ? 0 : (Number(form.employmentEmiratiMale) || 0) + (Number(form.employmentEmiratiFemale) || 0),
+          total_employees: form.employmentTotalEmployees === '' ? 0 : Number(form.employmentTotalEmployees)|| 0,
           updated_by: 1,
           updated_at: getCurrentISODate(),
           // Enhanced product handling for updates - only send product IDs that exist
diff --git a/ipi-survey-platform/src/pages/Admin/configuration/IsicHsCodes.jsx b/ipi-survey-platform/src/pages/Admin/configuration/IsicHsCodes.jsx
index 9c57f22..8142a71 100644
--- a/ipi-survey-platform/src/pages/Admin/configuration/IsicHsCodes.jsx
+++ b/ipi-survey-platform/src/pages/Admin/configuration/IsicHsCodes.jsx
@@ -1623,7 +1623,7 @@ const handleExportCSV = () => {
                         <option value="">Select Unit</option>
                         {unitOptions.map((option) => (
                           <option key={option.value} value={option.value}>
-                            {option.label}
+                            {option.label.split('-')[1].trim()}
                           </option>
                         ))}
                       </select>