diff --git a/console/index.js b/console/index.js
index 454fe483a6bda..24d4eebe6ce2c 100644
--- a/console/index.js
+++ b/console/index.js
@@ -2,14 +2,8 @@
 import GraphiQLWrapper from './src/components/ApiExplorer/GraphiQLWrapper';
 
 // import Data Tab parts
-import routes from './src/routes';
 import dataRouter from './src/components/Services/Data/DataRouter';
 import { dataReducer } from './src/components/Services/Data';
-import globals from './src/Globals';
-import endpoints from './src/Endpoints';
-import mainState from './src/components/Main/State';
-import { changeRequestHeader } from './src/components/ApiExplorer/Actions';
-import { validateLogin } from './src/components/Main/Actions';
 import dataHeaders from './src/components/Services/Data/Common/Headers';
 import { handleMigrationErrors } from './src/components/Services/Data/TableModify/ModifyActions';
 import {
@@ -21,6 +15,18 @@ import {
   ACCESS_KEY_ERROR,
 } from './src/components/Services/Data/DataActions';
 
+// import Event Tab parts
+import eventRouter from './src/components/Services/EventTrigger/EventRouter';
+import { eventReducer } from './src/components/Services/EventTrigger';
+
+// import other globals
+import routes from './src/routes';
+import globals from './src/Globals';
+import endpoints from './src/Endpoints';
+import mainState from './src/components/Main/State';
+import { changeRequestHeader } from './src/components/ApiExplorer/Actions';
+import { validateLogin } from './src/components/Main/Actions';
+
 const filterQueryScss = require('./src/components/Services/Data/TableBrowseRows/FilterQuery.scss');
 const tableScss = require('./src/components/Services/Data/TableCommon/Table.scss');
 
@@ -28,13 +34,20 @@ const tableScss = require('./src/components/Services/Data/TableCommon/Table.scss
 export { GraphiQLWrapper };
 
 // export Data Tab parts
-export default routes;
 export { dataRouter, dataReducer };
-export { globals, endpoints, mainState };
 export { fetchSchemaList, loadSchema, loadUntrackedSchema };
 export { UPDATE_CURRENT_SCHEMA, UPDATE_DATA_HEADERS, ACCESS_KEY_ERROR };
+export { dataHeaders };
+
+// export Event Tab parts
+export { eventRouter, eventReducer };
+
+// export other globals
+export default routes;
+export { globals, endpoints, mainState };
 export { changeRequestHeader };
 export { validateLogin };
-export { dataHeaders };
-export { filterQueryScss, tableScss };
 export { handleMigrationErrors };
+
+// export styles
+export { filterQueryScss, tableScss };
diff --git a/console/src/components/ApiExplorer/GraphiQLWrapper.js b/console/src/components/ApiExplorer/GraphiQLWrapper.js
index bbf11abfa7419..12d8c0ccf8761 100644
--- a/console/src/components/ApiExplorer/GraphiQLWrapper.js
+++ b/console/src/components/ApiExplorer/GraphiQLWrapper.js
@@ -16,7 +16,9 @@ class GraphiQLWrapper extends Component {
       onBoardingEnabled: false,
       queries: null,
     };
-    const queryFile = this.props.queryParams.query_file;
+    const queryFile = this.props.queryParams
+      ? this.props.queryParams.query_file
+      : null;
     if (queryFile) {
       getRemoteQueries(queryFile, queries =>
         this.setState({ ...this.state, queries })