diff --git a/server/src/models/SaleEstimate.js b/server/src/models/SaleEstimate.js
index 838da1694..8a8d4c01b 100644
--- a/server/src/models/SaleEstimate.js
+++ b/server/src/models/SaleEstimate.js
@@ -16,6 +16,13 @@ export default class SaleEstimate extends TenantModel {
     return ['createdAt', 'updatedAt'];
   }
 
+  /**
+   * Allows to mark model as resourceable to viewable and filterable.
+   */
+  static get resourceable() {
+    return true;
+  }
+
   /**
    * Relationship mapping.
    */
diff --git a/server/src/services/Sales/SalesEstimate.ts b/server/src/services/Sales/SalesEstimate.ts
index f79d41ca1..2dd3aa820 100644
--- a/server/src/services/Sales/SalesEstimate.ts
+++ b/server/src/services/Sales/SalesEstimate.ts
@@ -95,7 +95,7 @@ export default class SaleEstimateService {
     const amount = sumBy(estimateDTO.entries, e => ItemEntry.calcAmount(e));
     const estimateObj = {
       amount,
-      ...formatDateFields(estimateDTO, ['estimate_date', 'expiration_date']),
+      ...formatDateFields(estimateDTO, ['estimateDate', 'expirationDate']),
     };
 
     // Validate estimate number uniquiness on the storage.
@@ -140,7 +140,7 @@ export default class SaleEstimateService {
     const amount = sumBy(estimateDTO.entries, (e) => ItemEntry.calcAmount(e));
     const estimateObj = {
       amount,
-      ...formatDateFields(estimateDTO, ['estimate_date', 'expiration_date']),
+      ...formatDateFields(estimateDTO, ['estimateDate', 'expirationDate']),
     };
 
     // Validate estimate number uniquiness on the storage.