diff --git a/indexes/repo/settings.json b/indexes/repo/settings.json
index 25611df0..37af98ba 100644
--- a/indexes/repo/settings.json
+++ b/indexes/repo/settings.json
@@ -1,4 +1,5 @@
 {
+  "index.mapping.total_fields.limit": 2000,
   "analysis": {
     "filter": {
       "english_stop": {
diff --git a/manifest-staging.yml b/manifest-staging.yml
index 586aa2d5..9806af44 100644
--- a/manifest-staging.yml
+++ b/manifest-staging.yml
@@ -13,6 +13,7 @@ applications:
     CF_STAGING_TIMEOUT: 15
     CF_STARTUP_TIMEOUT: 15
     CLOUD_GOV: true
+    NODE_ENV: production
   services:
   - code_gov_elasticsearch
   stack: cflinuxfs2
diff --git a/manifest.yml b/manifest.yml
index 721fe4c9..f85c7db9 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -13,6 +13,7 @@ applications:
     CF_STAGING_TIMEOUT: 15
     CF_STARTUP_TIMEOUT: 15
     CLOUD_GOV: true
+    NODE_ENV: production
   services:
   - code_gov_elasticsearch
   stack: cflinuxfs2
diff --git a/services/formatter/index.js b/services/formatter/index.js
index 902cde7a..9299e3a7 100644
--- a/services/formatter/index.js
+++ b/services/formatter/index.js
@@ -157,7 +157,7 @@ class Formatter {
     return new Promise((resolve, reject) => {
       let formattedRepo;
       try {
-        if(schemaVersion === '2.0.1') {
+        if(schemaVersion === '2.0.0' || schemaVersion === '2.0.1') {
           formattedRepo = this._formatRepo(repo);
         } else {
           this._upgradeProject(repo);
diff --git a/services/indexer/repo/AgencyJsonStream.js b/services/indexer/repo/AgencyJsonStream.js
index 40493e23..d2aebee5 100644
--- a/services/indexer/repo/AgencyJsonStream.js
+++ b/services/indexer/repo/AgencyJsonStream.js
@@ -55,7 +55,7 @@ class AgencyJsonStream extends Transform {
   }
 
   _getAgencyCodeJson(agency){
-    logger.info('Entered saveFetchedCodeJson - Agency: ', agency.acronym);
+    logger.info('Entered getAgencyCodeJson - Agency: ', agency.acronym);
 
     if(this.config.prod_envs.includes(process.env.NODE_ENV)) {
       const errorMessage = 'FAILURE: There was an error fetching the code.json:';