diff --git a/server/config/type.js b/server/config/type.js
index 9c2ff46..7371a19 100644
--- a/server/config/type.js
+++ b/server/config/type.js
@@ -25,7 +25,7 @@ const ConfigType = class ConfigType {
     this.configPrefix = configName;
     this.jsonFields = jsonFields || [];
     this.relations = relations || [];
-    this.populate = populate || [];
+    this.populate = populate || null;
   }
 
   /**
@@ -111,19 +111,15 @@ const ConfigType = class ConfigType {
       // Update entity.
       this.relations.map(({ relationName }) => delete query[relationName]);
 
-      let entity;
-      switch (this.queryString) {
-          case "strapi::core-store":
-            entity = await queryAPI.update({
-              where: combinedUidWhereFilter,
-              data: query,
-            });
-            break;
-          default:
-            entity = await queryAPI.findOne({ where: combinedUidWhereFilter });
-            await strapi.entityService.update(this.queryString, entity.id, {
-              data: query,
-            });
+      const entity = await queryAPI.findOne({ where: combinedUidWhereFilter });
+      try {
+        await strapi.entityService.update(this.queryString, entity.id, {
+          data: query,
+        });
+      } catch(error) {
+        console.warn(error);
+        console.log("Use Query Engine API instead of Entity Service API");
+        await queryAPI.update({ where: combinedUidWhereFilter, data: query });
       }
 
       // Delete/create relations.
@@ -206,7 +202,7 @@ const ConfigType = class ConfigType {
    */
    getAllFromDatabase = async () => {
     const AllConfig = await noLimit(strapi.query(this.queryString), {
-      populate: this.populate || null,
+      populate: this.populate,
     });
     const configs = {};
 
@@ -236,24 +232,18 @@ const ConfigType = class ConfigType {
         formattedConfig[relationName] = relations;
       }));
 
-      this.populate
-        .filter((populatedFields) => !populatedFields.includes("."))
-        .map((populatedFields) => {
+      if (Array.isArray(this.populate)) {
+        this.populate
+          .filter((populatedFields) => !populatedFields.includes("."))
+          .map((populatedFields) => {
             formattedConfig[populatedFields] = formattedConfig[
               populatedFields
             ].map((fields) => {
-              const sanitizeObjects = (fields) => {
-                sanitizeConfig(fields);
-                Object.keys(fields).map((key, index) => {
-                  if (fields[key] && typeof fields[key] === "object") {
-                    sanitizeObjects(fields[key]);
-                  }
-                });
-              };
-              sanitizeObjects(fields);
+              sanitizeConfig(fields);
               return fields;
             });
-        });
+          });
+      }
 
       this.jsonFields.map((field) => formattedConfig[field] = JSON.parse(config[field]));
       configs[`${this.configPrefix}.${combinedUid}`] = formattedConfig;
diff --git a/server/utils/index.js b/server/utils/index.js
index 4a6c6f9..ca61959 100644
--- a/server/utils/index.js
+++ b/server/utils/index.js
@@ -47,11 +47,6 @@ const dynamicSort = (property) => {
 };
 
 const sanitizeConfig = (config, relation, relationSortFields) => {
-  delete config._id;
-  delete config.id;
-  delete config.updatedAt;
-  delete config.createdAt;
-
   if (relation) {
     const formattedRelations = [];
 
@@ -74,6 +69,20 @@ const sanitizeConfig = (config, relation, relationSortFields) => {
     config[relation] = formattedRelations;
   }
 
+  const sanitizeRecursive = (config) => {
+    delete config._id;
+    delete config.id;
+    delete config.updatedAt;
+    delete config.createdAt;
+
+    Object.keys(config).map((key, index) => {
+      if (config[key] && typeof config[key] === "object") {
+        sanitizeRecursive(config[key]);
+      }
+    });
+  };
+  sanitizeRecursive(config);
+
   return config;
 };