diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index 7ef7ea0e03..217f3774bb 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -214,7 +214,6 @@ module.exports = {
             '/3.0.0-beta.x/guides/secure-your-app',
             '/3.0.0-beta.x/guides/send-email',
             '/3.0.0-beta.x/guides/registering-a-field-in-admin',
-            '/3.0.0-beta.x/guides/count-graphql',
             '/3.0.0-beta.x/guides/client',
             '/3.0.0-beta.x/guides/update-version',
           ],
diff --git a/docs/3.0.0-beta.x/deployment/google-app-engine.md b/docs/3.0.0-beta.x/deployment/google-app-engine.md
index 1c674e95c0..6784dbad28 100644
--- a/docs/3.0.0-beta.x/deployment/google-app-engine.md
+++ b/docs/3.0.0-beta.x/deployment/google-app-engine.md
@@ -111,7 +111,7 @@ runtime: nodejs10
 instance_class: F2
 
 env_variables:
-  HOST: '<project_id>.appspot.com'
+  HOST: '0.0.0.0'
   NODE_ENV: 'production'
   DATABASE_NAME: 'strapi'
   DATABASE_USERNAME: 'postgres'
@@ -132,7 +132,7 @@ runtime: nodejs10
 env: flex
 
 env_variables:
-  HOST: '<project_id>.appspot.com'
+  HOST: '0.0.0.0'
   NODE_ENV: 'production'
   DATABASE_NAME: 'strapi'
   DATABASE_USERNAME: 'postgres'
diff --git a/packages/strapi-database/lib/database-manager.js b/packages/strapi-database/lib/database-manager.js
index 0aa9fcf362..90771ed595 100644
--- a/packages/strapi-database/lib/database-manager.js
+++ b/packages/strapi-database/lib/database-manager.js
@@ -101,11 +101,11 @@ class DatabaseManager {
       return _.get(strapi.admin, ['models', key]);
     }
 
-    return (
-      _.get(strapi.plugins, [plugin, 'models', key]) ||
-      _.get(strapi, ['models', key]) ||
-      _.get(strapi, ['components', key])
-    );
+    if (plugin) {
+      return _.get(strapi.plugins, [plugin, 'models', key]);
+    }
+
+    return _.get(strapi, ['models', key]) || _.get(strapi, ['components', key]);
   }
 
   getModelByCollectionName(collectionName) {
diff --git a/packages/strapi-utils/lib/__tests__/parse-type.test.js b/packages/strapi-utils/lib/__tests__/parse-type.test.js
index 6d90e8579c..29e7b417b8 100644
--- a/packages/strapi-utils/lib/__tests__/parse-type.test.js
+++ b/packages/strapi-utils/lib/__tests__/parse-type.test.js
@@ -1,4 +1,5 @@
 const parseType = require('../parse-type');
+const format = require('date-fns/format');
 
 describe('parseType', () => {
   describe('boolean', () => {
@@ -50,7 +51,10 @@ describe('parseType', () => {
 
       expect(parseType({ type: 'date', value: '2018-11-02' })).toBe('2018-11-02');
 
-      expect(parseType({ type: 'date', value: '2019-04-21T00:00:00.000Z' })).toBe('2019-04-21');
+      const isoDateFormat = new Date().toISOString();
+      const expectedDateFormat = format(new Date(isoDateFormat), 'yyyy-MM-dd');
+
+      expect(parseType({ type: 'date', value: isoDateFormat })).toBe(expectedDateFormat);
     });
 
     it('Throws on invalid formator dates', () => {