diff --git a/helpers/initializer.database.cemetery.js b/helpers/initializer.database.cemetery.js
index 4ba35533..20684876 100644
--- a/helpers/initializer.database.cemetery.js
+++ b/helpers/initializer.database.cemetery.js
@@ -87,11 +87,11 @@ const initializeCemeteryDatabase = () => {
         occupancyType: "Interment",
         orderNumber: 2
     }, session);
-    addOccupancyType({
+    const cremationOccupancyTypeId = addOccupancyType({
         occupancyType: "Cremation",
         orderNumber: 3
     }, session);
-    addOccupancyTypeField({
+    const deathDateField = {
         occupancyTypeId: intermentOccupancyTypeId,
         occupancyTypeField: "Death Date",
         occupancyTypeFieldValues: "",
@@ -100,8 +100,10 @@ const initializeCemeteryDatabase = () => {
         minimumLength: 10,
         maximumLength: 10,
         orderNumber: 1
-    }, session);
-    addOccupancyTypeField({
+    };
+    addOccupancyTypeField(deathDateField, session);
+    addOccupancyTypeField(Object.assign(deathDateField, { occupancyTypeId: cremationOccupancyTypeId }), session);
+    const deathAgeField = {
         occupancyTypeId: intermentOccupancyTypeId,
         occupancyTypeField: "Death Age",
         occupancyTypeFieldValues: "",
@@ -110,8 +112,10 @@ const initializeCemeteryDatabase = () => {
         minimumLength: 1,
         maximumLength: 3,
         orderNumber: 2
-    }, session);
-    addOccupancyTypeField({
+    };
+    addOccupancyTypeField(deathAgeField, session);
+    addOccupancyTypeField(Object.assign(deathAgeField, { occupancyTypeId: cremationOccupancyTypeId }), session);
+    const deathAgePeriod = {
         occupancyTypeId: intermentOccupancyTypeId,
         occupancyTypeField: "Death Age Period",
         occupancyTypeFieldValues: "Years\nMonths\nDays\nStillborn",
@@ -120,8 +124,10 @@ const initializeCemeteryDatabase = () => {
         minimumLength: 1,
         maximumLength: 10,
         orderNumber: 3
-    }, session);
-    addOccupancyTypeField({
+    };
+    addOccupancyTypeField(deathAgePeriod, session);
+    addOccupancyTypeField(Object.assign(deathAgePeriod, { occupancyTypeId: cremationOccupancyTypeId }), session);
+    const deathPlace = {
         occupancyTypeId: intermentOccupancyTypeId,
         occupancyTypeField: "Death Place",
         occupancyTypeFieldValues: "",
@@ -130,8 +136,10 @@ const initializeCemeteryDatabase = () => {
         minimumLength: 1,
         maximumLength: 100,
         orderNumber: 4
-    }, session);
-    addOccupancyTypeField({
+    };
+    addOccupancyTypeField(deathPlace, session);
+    addOccupancyTypeField(Object.assign(deathPlace, { occupancyTypeId: cremationOccupancyTypeId }), session);
+    const funeralHome = {
         occupancyTypeId: intermentOccupancyTypeId,
         occupancyTypeField: "Funeral Home",
         occupancyTypeFieldValues: "",
@@ -140,8 +148,10 @@ const initializeCemeteryDatabase = () => {
         minimumLength: 1,
         maximumLength: 100,
         orderNumber: 10
-    }, session);
-    addOccupancyTypeField({
+    };
+    addOccupancyTypeField(funeralHome, session);
+    addOccupancyTypeField(Object.assign(funeralHome, { occupancyTypeId: cremationOccupancyTypeId }), session);
+    const funeralDate = {
         occupancyTypeId: intermentOccupancyTypeId,
         occupancyTypeField: "Funeral Date",
         occupancyTypeFieldValues: "",
@@ -150,8 +160,10 @@ const initializeCemeteryDatabase = () => {
         minimumLength: 10,
         maximumLength: 10,
         orderNumber: 11
-    }, session);
-    addOccupancyTypeField({
+    };
+    addOccupancyTypeField(funeralDate, session);
+    addOccupancyTypeField(Object.assign(funeralDate, { occupancyTypeId: cremationOccupancyTypeId }), session);
+    const containerType = {
         occupancyTypeId: intermentOccupancyTypeId,
         occupancyTypeField: "Container Type",
         occupancyTypeFieldValues: "",
@@ -160,8 +172,10 @@ const initializeCemeteryDatabase = () => {
         minimumLength: 1,
         maximumLength: 100,
         orderNumber: 20
-    }, session);
-    addOccupancyTypeField({
+    };
+    addOccupancyTypeField(containerType, session);
+    addOccupancyTypeField(Object.assign(containerType, { occupancyTypeId: cremationOccupancyTypeId }), session);
+    const committalType = {
         occupancyTypeId: intermentOccupancyTypeId,
         occupancyTypeField: "Committal Type",
         occupancyTypeFieldValues: "",
@@ -170,7 +184,9 @@ const initializeCemeteryDatabase = () => {
         minimumLength: 1,
         maximumLength: 100,
         orderNumber: 21
-    }, session);
+    };
+    addOccupancyTypeField(committalType, session);
+    addOccupancyTypeField(Object.assign(committalType, { occupancyTypeId: cremationOccupancyTypeId }), session);
     addFeeCategory({
         feeCategory: "Interment Rights",
         orderNumber: 1
diff --git a/helpers/initializer.database.cemetery.ts b/helpers/initializer.database.cemetery.ts
index 85aa5d23..afd27750 100644
--- a/helpers/initializer.database.cemetery.ts
+++ b/helpers/initializer.database.cemetery.ts
@@ -185,7 +185,7 @@ const initializeCemeteryDatabase = () => {
         session
     );
 
-    addOccupancyType(
+    const cremationOccupancyTypeId = addOccupancyType(
         {
             occupancyType: "Cremation",
             orderNumber: 3
@@ -193,115 +193,163 @@ const initializeCemeteryDatabase = () => {
         session
     );
 
+    // Death Date
+
+    const deathDateField = {
+        occupancyTypeId: intermentOccupancyTypeId,
+        occupancyTypeField: "Death Date",
+        occupancyTypeFieldValues: "",
+        pattern: "\\d{4}([\\/-]\\d{2}){2}",
+        isRequired: "",
+        minimumLength: 10,
+        maximumLength: 10,
+        orderNumber: 1
+    };
+
+    addOccupancyTypeField(deathDateField, session);
+
     addOccupancyTypeField(
-        {
-            occupancyTypeId: intermentOccupancyTypeId,
-            occupancyTypeField: "Death Date",
-            occupancyTypeFieldValues: "",
-            pattern: "\\d{4}([\\/-]\\d{2}){2}",
-            isRequired: "",
-            minimumLength: 10,
-            maximumLength: 10,
-            orderNumber: 1
-        },
+        Object.assign(deathDateField, { occupancyTypeId: cremationOccupancyTypeId }),
         session
     );
 
+    // Death Age
+
+    const deathAgeField = {
+        occupancyTypeId: intermentOccupancyTypeId,
+        occupancyTypeField: "Death Age",
+        occupancyTypeFieldValues: "",
+        pattern: "\\d+",
+        isRequired: "",
+        minimumLength: 1,
+        maximumLength: 3,
+        orderNumber: 2
+    };
+
+    addOccupancyTypeField(deathAgeField, session);
+
     addOccupancyTypeField(
-        {
-            occupancyTypeId: intermentOccupancyTypeId,
-            occupancyTypeField: "Death Age",
-            occupancyTypeFieldValues: "",
-            pattern: "\\d+",
-            isRequired: "",
-            minimumLength: 1,
-            maximumLength: 3,
-            orderNumber: 2
-        },
+        Object.assign(deathAgeField, { occupancyTypeId: cremationOccupancyTypeId }),
         session
     );
 
+    // Death Age Period
+
+    const deathAgePeriod = {
+        occupancyTypeId: intermentOccupancyTypeId,
+        occupancyTypeField: "Death Age Period",
+        occupancyTypeFieldValues: "Years\nMonths\nDays\nStillborn",
+        pattern: "",
+        isRequired: "",
+        minimumLength: 1,
+        maximumLength: 10,
+        orderNumber: 3
+    };
+
+    addOccupancyTypeField(deathAgePeriod, session);
+
     addOccupancyTypeField(
-        {
-            occupancyTypeId: intermentOccupancyTypeId,
-            occupancyTypeField: "Death Age Period",
-            occupancyTypeFieldValues: "Years\nMonths\nDays\nStillborn",
-            pattern: "",
-            isRequired: "",
-            minimumLength: 1,
-            maximumLength: 10,
-            orderNumber: 3
-        },
+        Object.assign(deathAgePeriod, { occupancyTypeId: cremationOccupancyTypeId }),
         session
     );
 
+    // Death Place
+
+    const deathPlace = {
+        occupancyTypeId: intermentOccupancyTypeId,
+        occupancyTypeField: "Death Place",
+        occupancyTypeFieldValues: "",
+        pattern: "",
+        isRequired: "",
+        minimumLength: 1,
+        maximumLength: 100,
+        orderNumber: 4
+    };
+
+    addOccupancyTypeField(deathPlace, session);
+
     addOccupancyTypeField(
-        {
-            occupancyTypeId: intermentOccupancyTypeId,
-            occupancyTypeField: "Death Place",
-            occupancyTypeFieldValues: "",
-            pattern: "",
-            isRequired: "",
-            minimumLength: 1,
-            maximumLength: 100,
-            orderNumber: 4
-        },
+        Object.assign(deathPlace, { occupancyTypeId: cremationOccupancyTypeId }),
         session
     );
 
+    // Funeral Home
+
+    const funeralHome = {
+        occupancyTypeId: intermentOccupancyTypeId,
+        occupancyTypeField: "Funeral Home",
+        occupancyTypeFieldValues: "",
+        pattern: "",
+        isRequired: "",
+        minimumLength: 1,
+        maximumLength: 100,
+        orderNumber: 10
+    };
+
+    addOccupancyTypeField(funeralHome, session);
+
     addOccupancyTypeField(
-        {
-            occupancyTypeId: intermentOccupancyTypeId,
-            occupancyTypeField: "Funeral Home",
-            occupancyTypeFieldValues: "",
-            pattern: "",
-            isRequired: "",
-            minimumLength: 1,
-            maximumLength: 100,
-            orderNumber: 10
-        },
+        Object.assign(funeralHome, { occupancyTypeId: cremationOccupancyTypeId }),
         session
     );
 
+    // Funeral Date
+
+    const funeralDate = {
+        occupancyTypeId: intermentOccupancyTypeId,
+        occupancyTypeField: "Funeral Date",
+        occupancyTypeFieldValues: "",
+        pattern: "\\d{4}([\\/-]\\d{2}){2}",
+        isRequired: "",
+        minimumLength: 10,
+        maximumLength: 10,
+        orderNumber: 11
+    };
+
+    addOccupancyTypeField(funeralDate, session);
+
     addOccupancyTypeField(
-        {
-            occupancyTypeId: intermentOccupancyTypeId,
-            occupancyTypeField: "Funeral Date",
-            occupancyTypeFieldValues: "",
-            pattern: "\\d{4}([\\/-]\\d{2}){2}",
-            isRequired: "",
-            minimumLength: 10,
-            maximumLength: 10,
-            orderNumber: 11
-        },
+        Object.assign(funeralDate, { occupancyTypeId: cremationOccupancyTypeId }),
         session
     );
 
+    // Container Type
+
+    const containerType = {
+        occupancyTypeId: intermentOccupancyTypeId,
+        occupancyTypeField: "Container Type",
+        occupancyTypeFieldValues: "",
+        pattern: "",
+        isRequired: "",
+        minimumLength: 1,
+        maximumLength: 100,
+        orderNumber: 20
+    };
+
+    addOccupancyTypeField(containerType, session);
+
     addOccupancyTypeField(
-        {
-            occupancyTypeId: intermentOccupancyTypeId,
-            occupancyTypeField: "Container Type",
-            occupancyTypeFieldValues: "",
-            pattern: "",
-            isRequired: "",
-            minimumLength: 1,
-            maximumLength: 100,
-            orderNumber: 20
-        },
+        Object.assign(containerType, { occupancyTypeId: cremationOccupancyTypeId }),
         session
     );
 
+    // Committal Type
+
+    const committalType = {
+        occupancyTypeId: intermentOccupancyTypeId,
+        occupancyTypeField: "Committal Type",
+        occupancyTypeFieldValues: "",
+        pattern: "",
+        isRequired: "",
+        minimumLength: 1,
+        maximumLength: 100,
+        orderNumber: 21
+    };
+
+    addOccupancyTypeField(committalType, session);
+
     addOccupancyTypeField(
-        {
-            occupancyTypeId: intermentOccupancyTypeId,
-            occupancyTypeField: "Committal Type",
-            occupancyTypeFieldValues: "",
-            pattern: "",
-            isRequired: "",
-            minimumLength: 1,
-            maximumLength: 100,
-            orderNumber: 21
-        },
+        Object.assign(committalType, { occupancyTypeId: cremationOccupancyTypeId }),
         session
     );
 
diff --git a/temp/legacy.importFromCSV.js b/temp/legacy.importFromCSV.js
index a4eb2810..08d75424 100644
--- a/temp/legacy.importFromCSV.js
+++ b/temp/legacy.importFromCSV.js
@@ -181,7 +181,6 @@ const takenLotStatus = cacheFunctions.getLotStatusByLotStatus("Taken");
 const preneedOccupancyType = cacheFunctions.getOccupancyTypeByOccupancyType("Preneed");
 const deceasedOccupancyType = cacheFunctions.getOccupancyTypeByOccupancyType("Interment");
 const cremationOccupancyType = cacheFunctions.getOccupancyTypeByOccupancyType("Cremation");
-const allOccupancyTypeFields = cacheFunctions.getAllOccupancyTypeFields();
 const preneedOwnerLotOccupantType = cacheFunctions.getLotOccupantTypeByLotOccupantType("Preneed Owner");
 const funeralDirectorLotOccupantType = cacheFunctions.getLotOccupantTypeByLotOccupantType("Funeral Director");
 const deceasedLotOccupantType = cacheFunctions.getLotOccupantTypeByLotOccupantType("Deceased");
@@ -418,7 +417,9 @@ function importFromMasterCSV() {
                     const lotOccupancyFieldValue = formatDateString(masterRow.CM_DEATH_YR, masterRow.CM_DEATH_MON, masterRow.CM_DEATH_DAY);
                     addOrUpdateLotOccupancyField({
                         lotOccupancyId: deceasedLotOccupancyId,
-                        occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => {
+                        occupancyTypeFieldId: (lotId
+                            ? deceasedOccupancyType
+                            : cremationOccupancyType).occupancyTypeFields.find((occupancyTypeField) => {
                             return occupancyTypeField.occupancyTypeField === "Death Date";
                         }).occupancyTypeFieldId,
                         lotOccupancyFieldValue
@@ -427,7 +428,9 @@ function importFromMasterCSV() {
                 if (masterRow.CM_AGE !== "") {
                     addOrUpdateLotOccupancyField({
                         lotOccupancyId: deceasedLotOccupancyId,
-                        occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => {
+                        occupancyTypeFieldId: (lotId
+                            ? deceasedOccupancyType
+                            : cremationOccupancyType).occupancyTypeFields.find((occupancyTypeField) => {
                             return occupancyTypeField.occupancyTypeField === "Death Age";
                         }).occupancyTypeFieldId,
                         lotOccupancyFieldValue: masterRow.CM_AGE
@@ -436,8 +439,10 @@ function importFromMasterCSV() {
                 if (masterRow.CM_PERIOD !== "") {
                     addOrUpdateLotOccupancyField({
                         lotOccupancyId: deceasedLotOccupancyId,
-                        occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => {
-                            return (occupancyTypeField.occupancyTypeField === "Death Age Period");
+                        occupancyTypeFieldId: (lotId
+                            ? deceasedOccupancyType
+                            : cremationOccupancyType).occupancyTypeFields.find((occupancyTypeField) => {
+                            return occupancyTypeField.occupancyTypeField === "Death Age Period";
                         }).occupancyTypeFieldId,
                         lotOccupancyFieldValue: masterRow.CM_PERIOD
                     }, user);
@@ -461,7 +466,9 @@ function importFromMasterCSV() {
                     const lotOccupancyFieldValue = formatDateString(masterRow.CM_FUNERAL_YR, masterRow.CM_FUNERAL_MON, masterRow.CM_FUNERAL_DAY);
                     addOrUpdateLotOccupancyField({
                         lotOccupancyId: deceasedLotOccupancyId,
-                        occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => {
+                        occupancyTypeFieldId: (lotId
+                            ? deceasedOccupancyType
+                            : cremationOccupancyType).occupancyTypeFields.find((occupancyTypeField) => {
                             return occupancyTypeField.occupancyTypeField === "Funeral Date";
                         }).occupancyTypeFieldId,
                         lotOccupancyFieldValue
@@ -470,8 +477,10 @@ function importFromMasterCSV() {
                 if (masterRow.CM_CONTAINER_TYPE !== "") {
                     addOrUpdateLotOccupancyField({
                         lotOccupancyId: deceasedLotOccupancyId,
-                        occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => {
-                            return (occupancyTypeField.occupancyTypeField === "Container Type");
+                        occupancyTypeFieldId: (lotId
+                            ? deceasedOccupancyType
+                            : cremationOccupancyType).occupancyTypeFields.find((occupancyTypeField) => {
+                            return occupancyTypeField.occupancyTypeField === "Container Type";
                         }).occupancyTypeFieldId,
                         lotOccupancyFieldValue: masterRow.CM_CONTAINER_TYPE
                     }, user);
@@ -483,8 +492,10 @@ function importFromMasterCSV() {
                     }
                     addOrUpdateLotOccupancyField({
                         lotOccupancyId: deceasedLotOccupancyId,
-                        occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => {
-                            return (occupancyTypeField.occupancyTypeField === "Committal Type");
+                        occupancyTypeFieldId: (lotId
+                            ? deceasedOccupancyType
+                            : cremationOccupancyType).occupancyTypeFields.find((occupancyTypeField) => {
+                            return occupancyTypeField.occupancyTypeField === "Committal Type";
                         }).occupancyTypeFieldId,
                         lotOccupancyFieldValue: commitalType
                     }, user);
@@ -867,7 +878,7 @@ function importFromWorkOrderCSV() {
                 const lotOccupancyFieldValue = formatDateString(workOrderRow.WO_DEATH_YR, workOrderRow.WO_DEATH_MON, workOrderRow.WO_DEATH_DAY);
                 addOrUpdateLotOccupancyField({
                     lotOccupancyId: lotOccupancyId,
-                    occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => {
+                    occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find((occupancyTypeField) => {
                         return occupancyTypeField.occupancyTypeField === "Death Date";
                     }).occupancyTypeFieldId,
                     lotOccupancyFieldValue
@@ -876,7 +887,7 @@ function importFromWorkOrderCSV() {
             if (workOrderRow.WO_DEATH_PLACE !== "") {
                 addOrUpdateLotOccupancyField({
                     lotOccupancyId: lotOccupancyId,
-                    occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => {
+                    occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find((occupancyTypeField) => {
                         return occupancyTypeField.occupancyTypeField === "Death Place";
                     }).occupancyTypeFieldId,
                     lotOccupancyFieldValue: workOrderRow.WO_DEATH_PLACE
@@ -885,7 +896,7 @@ function importFromWorkOrderCSV() {
             if (workOrderRow.WO_AGE !== "") {
                 addOrUpdateLotOccupancyField({
                     lotOccupancyId: lotOccupancyId,
-                    occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => {
+                    occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find((occupancyTypeField) => {
                         return occupancyTypeField.occupancyTypeField === "Death Age";
                     }).occupancyTypeFieldId,
                     lotOccupancyFieldValue: workOrderRow.WO_AGE
@@ -894,7 +905,7 @@ function importFromWorkOrderCSV() {
             if (workOrderRow.WO_PERIOD !== "") {
                 addOrUpdateLotOccupancyField({
                     lotOccupancyId: lotOccupancyId,
-                    occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => {
+                    occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find((occupancyTypeField) => {
                         return occupancyTypeField.occupancyTypeField === "Death Age Period";
                     }).occupancyTypeFieldId,
                     lotOccupancyFieldValue: workOrderRow.WO_PERIOD
@@ -919,7 +930,7 @@ function importFromWorkOrderCSV() {
                 const lotOccupancyFieldValue = formatDateString(workOrderRow.WO_FUNERAL_YR, workOrderRow.WO_FUNERAL_MON, workOrderRow.WO_FUNERAL_DAY);
                 addOrUpdateLotOccupancyField({
                     lotOccupancyId: lotOccupancyId,
-                    occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => {
+                    occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find((occupancyTypeField) => {
                         return occupancyTypeField.occupancyTypeField === "Funeral Date";
                     }).occupancyTypeFieldId,
                     lotOccupancyFieldValue
@@ -928,7 +939,7 @@ function importFromWorkOrderCSV() {
             if (workOrderRow.WO_CONTAINER_TYPE !== "") {
                 addOrUpdateLotOccupancyField({
                     lotOccupancyId: lotOccupancyId,
-                    occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => {
+                    occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find((occupancyTypeField) => {
                         return occupancyTypeField.occupancyTypeField === "Container Type";
                     }).occupancyTypeFieldId,
                     lotOccupancyFieldValue: workOrderRow.WO_CONTAINER_TYPE
@@ -941,7 +952,7 @@ function importFromWorkOrderCSV() {
                 }
                 addOrUpdateLotOccupancyField({
                     lotOccupancyId: lotOccupancyId,
-                    occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => {
+                    occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find((occupancyTypeField) => {
                         return occupancyTypeField.occupancyTypeField === "Committal Type";
                     }).occupancyTypeFieldId,
                     lotOccupancyFieldValue: commitalType
diff --git a/temp/legacy.importFromCSV.ts b/temp/legacy.importFromCSV.ts
index 67148871..09fd28fb 100644
--- a/temp/legacy.importFromCSV.ts
+++ b/temp/legacy.importFromCSV.ts
@@ -415,8 +415,6 @@ const preneedOccupancyType = cacheFunctions.getOccupancyTypeByOccupancyType("Pre
 const deceasedOccupancyType = cacheFunctions.getOccupancyTypeByOccupancyType("Interment");
 const cremationOccupancyType = cacheFunctions.getOccupancyTypeByOccupancyType("Cremation");
 
-const allOccupancyTypeFields = cacheFunctions.getAllOccupancyTypeFields();
-
 const preneedOwnerLotOccupantType =
     cacheFunctions.getLotOccupantTypeByLotOccupantType("Preneed Owner");
 const funeralDirectorLotOccupantType =
@@ -760,11 +758,12 @@ function importFromMasterCSV() {
                     addOrUpdateLotOccupancyField(
                         {
                             lotOccupancyId: deceasedLotOccupancyId,
-                            occupancyTypeFieldId: allOccupancyTypeFields.find(
-                                (occupancyTypeField) => {
-                                    return occupancyTypeField.occupancyTypeField === "Death Date";
-                                }
-                            ).occupancyTypeFieldId,
+                            occupancyTypeFieldId: (lotId
+                                ? deceasedOccupancyType
+                                : cremationOccupancyType
+                            ).occupancyTypeFields.find((occupancyTypeField) => {
+                                return occupancyTypeField.occupancyTypeField === "Death Date";
+                            }).occupancyTypeFieldId,
                             lotOccupancyFieldValue
                         },
                         user
@@ -775,11 +774,12 @@ function importFromMasterCSV() {
                     addOrUpdateLotOccupancyField(
                         {
                             lotOccupancyId: deceasedLotOccupancyId,
-                            occupancyTypeFieldId: allOccupancyTypeFields.find(
-                                (occupancyTypeField) => {
-                                    return occupancyTypeField.occupancyTypeField === "Death Age";
-                                }
-                            ).occupancyTypeFieldId,
+                            occupancyTypeFieldId: (lotId
+                                ? deceasedOccupancyType
+                                : cremationOccupancyType
+                            ).occupancyTypeFields.find((occupancyTypeField) => {
+                                return occupancyTypeField.occupancyTypeField === "Death Age";
+                            }).occupancyTypeFieldId,
                             lotOccupancyFieldValue: masterRow.CM_AGE
                         },
                         user
@@ -790,13 +790,12 @@ function importFromMasterCSV() {
                     addOrUpdateLotOccupancyField(
                         {
                             lotOccupancyId: deceasedLotOccupancyId,
-                            occupancyTypeFieldId: allOccupancyTypeFields.find(
-                                (occupancyTypeField) => {
-                                    return (
-                                        occupancyTypeField.occupancyTypeField === "Death Age Period"
-                                    );
-                                }
-                            ).occupancyTypeFieldId,
+                            occupancyTypeFieldId: (lotId
+                                ? deceasedOccupancyType
+                                : cremationOccupancyType
+                            ).occupancyTypeFields.find((occupancyTypeField) => {
+                                return occupancyTypeField.occupancyTypeField === "Death Age Period";
+                            }).occupancyTypeFieldId,
                             lotOccupancyFieldValue: masterRow.CM_PERIOD
                         },
                         user
@@ -848,11 +847,12 @@ function importFromMasterCSV() {
                     addOrUpdateLotOccupancyField(
                         {
                             lotOccupancyId: deceasedLotOccupancyId,
-                            occupancyTypeFieldId: allOccupancyTypeFields.find(
-                                (occupancyTypeField) => {
-                                    return occupancyTypeField.occupancyTypeField === "Funeral Date";
-                                }
-                            ).occupancyTypeFieldId,
+                            occupancyTypeFieldId: (lotId
+                                ? deceasedOccupancyType
+                                : cremationOccupancyType
+                            ).occupancyTypeFields.find((occupancyTypeField) => {
+                                return occupancyTypeField.occupancyTypeField === "Funeral Date";
+                            }).occupancyTypeFieldId,
                             lotOccupancyFieldValue
                         },
                         user
@@ -863,13 +863,12 @@ function importFromMasterCSV() {
                     addOrUpdateLotOccupancyField(
                         {
                             lotOccupancyId: deceasedLotOccupancyId,
-                            occupancyTypeFieldId: allOccupancyTypeFields.find(
-                                (occupancyTypeField) => {
-                                    return (
-                                        occupancyTypeField.occupancyTypeField === "Container Type"
-                                    );
-                                }
-                            ).occupancyTypeFieldId,
+                            occupancyTypeFieldId: (lotId
+                                ? deceasedOccupancyType
+                                : cremationOccupancyType
+                            ).occupancyTypeFields.find((occupancyTypeField) => {
+                                return occupancyTypeField.occupancyTypeField === "Container Type";
+                            }).occupancyTypeFieldId,
                             lotOccupancyFieldValue: masterRow.CM_CONTAINER_TYPE
                         },
                         user
@@ -886,13 +885,12 @@ function importFromMasterCSV() {
                     addOrUpdateLotOccupancyField(
                         {
                             lotOccupancyId: deceasedLotOccupancyId,
-                            occupancyTypeFieldId: allOccupancyTypeFields.find(
-                                (occupancyTypeField) => {
-                                    return (
-                                        occupancyTypeField.occupancyTypeField === "Committal Type"
-                                    );
-                                }
-                            ).occupancyTypeFieldId,
+                            occupancyTypeFieldId: (lotId
+                                ? deceasedOccupancyType
+                                : cremationOccupancyType
+                            ).occupancyTypeFields.find((occupancyTypeField) => {
+                                return occupancyTypeField.occupancyTypeField === "Committal Type";
+                            }).occupancyTypeFieldId,
                             lotOccupancyFieldValue: commitalType
                         },
                         user
@@ -1432,9 +1430,11 @@ function importFromWorkOrderCSV() {
                 addOrUpdateLotOccupancyField(
                     {
                         lotOccupancyId: lotOccupancyId,
-                        occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => {
-                            return occupancyTypeField.occupancyTypeField === "Death Date";
-                        }).occupancyTypeFieldId,
+                        occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find(
+                            (occupancyTypeField) => {
+                                return occupancyTypeField.occupancyTypeField === "Death Date";
+                            }
+                        ).occupancyTypeFieldId,
                         lotOccupancyFieldValue
                     },
                     user
@@ -1445,9 +1445,11 @@ function importFromWorkOrderCSV() {
                 addOrUpdateLotOccupancyField(
                     {
                         lotOccupancyId: lotOccupancyId,
-                        occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => {
-                            return occupancyTypeField.occupancyTypeField === "Death Place";
-                        }).occupancyTypeFieldId,
+                        occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find(
+                            (occupancyTypeField) => {
+                                return occupancyTypeField.occupancyTypeField === "Death Place";
+                            }
+                        ).occupancyTypeFieldId,
                         lotOccupancyFieldValue: workOrderRow.WO_DEATH_PLACE
                     },
                     user
@@ -1458,9 +1460,11 @@ function importFromWorkOrderCSV() {
                 addOrUpdateLotOccupancyField(
                     {
                         lotOccupancyId: lotOccupancyId,
-                        occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => {
-                            return occupancyTypeField.occupancyTypeField === "Death Age";
-                        }).occupancyTypeFieldId,
+                        occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find(
+                            (occupancyTypeField) => {
+                                return occupancyTypeField.occupancyTypeField === "Death Age";
+                            }
+                        ).occupancyTypeFieldId,
                         lotOccupancyFieldValue: workOrderRow.WO_AGE
                     },
                     user
@@ -1471,9 +1475,11 @@ function importFromWorkOrderCSV() {
                 addOrUpdateLotOccupancyField(
                     {
                         lotOccupancyId: lotOccupancyId,
-                        occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => {
-                            return occupancyTypeField.occupancyTypeField === "Death Age Period";
-                        }).occupancyTypeFieldId,
+                        occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find(
+                            (occupancyTypeField) => {
+                                return occupancyTypeField.occupancyTypeField === "Death Age Period";
+                            }
+                        ).occupancyTypeFieldId,
                         lotOccupancyFieldValue: workOrderRow.WO_PERIOD
                     },
                     user
@@ -1523,9 +1529,11 @@ function importFromWorkOrderCSV() {
                 addOrUpdateLotOccupancyField(
                     {
                         lotOccupancyId: lotOccupancyId,
-                        occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => {
-                            return occupancyTypeField.occupancyTypeField === "Funeral Date";
-                        }).occupancyTypeFieldId,
+                        occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find(
+                            (occupancyTypeField) => {
+                                return occupancyTypeField.occupancyTypeField === "Funeral Date";
+                            }
+                        ).occupancyTypeFieldId,
                         lotOccupancyFieldValue
                     },
                     user
@@ -1536,9 +1544,11 @@ function importFromWorkOrderCSV() {
                 addOrUpdateLotOccupancyField(
                     {
                         lotOccupancyId: lotOccupancyId,
-                        occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => {
-                            return occupancyTypeField.occupancyTypeField === "Container Type";
-                        }).occupancyTypeFieldId,
+                        occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find(
+                            (occupancyTypeField) => {
+                                return occupancyTypeField.occupancyTypeField === "Container Type";
+                            }
+                        ).occupancyTypeFieldId,
                         lotOccupancyFieldValue: workOrderRow.WO_CONTAINER_TYPE
                     },
                     user
@@ -1555,9 +1565,11 @@ function importFromWorkOrderCSV() {
                 addOrUpdateLotOccupancyField(
                     {
                         lotOccupancyId: lotOccupancyId,
-                        occupancyTypeFieldId: allOccupancyTypeFields.find((occupancyTypeField) => {
-                            return occupancyTypeField.occupancyTypeField === "Committal Type";
-                        }).occupancyTypeFieldId,
+                        occupancyTypeFieldId: deceasedOccupancyType.occupancyTypeFields.find(
+                            (occupancyTypeField) => {
+                                return occupancyTypeField.occupancyTypeField === "Committal Type";
+                            }
+                        ).occupancyTypeFieldId,
                         lotOccupancyFieldValue: commitalType
                     },
                     user