diff --git a/frontend/src/Components/Form/IndexersSelectInputConnector.js b/frontend/src/Components/Form/IndexersSelectInputConnector.js
index 06b805857..8e596650f 100644
--- a/frontend/src/Components/Form/IndexersSelectInputConnector.js
+++ b/frontend/src/Components/Form/IndexersSelectInputConnector.js
@@ -42,7 +42,6 @@ function createMapStateToProps() {
 class IndexersSelectInputConnector extends Component {
 
   onChange = ({ name, value }) => {
-    console.log(name, value);
     this.props.onChange({ name, value });
   }
 
diff --git a/frontend/src/History/Details/HistoryDetails.js b/frontend/src/History/Details/HistoryDetails.js
index 15038f7d8..f2d8857f9 100644
--- a/frontend/src/History/Details/HistoryDetails.js
+++ b/frontend/src/History/Details/HistoryDetails.js
@@ -25,7 +25,7 @@ function HistoryDetails(props) {
         <DescriptionListItem
           descriptionClassName={styles.description}
           title={translate('Query')}
-          data={query}
+          data={query ? query : '-'}
         />
 
         {
@@ -40,7 +40,7 @@ function HistoryDetails(props) {
           !!data &&
             <DescriptionListItem
               title={'Query Results'}
-              data={queryResults}
+              data={queryResults ? queryResults : '-'}
             />
         }
 
@@ -48,7 +48,7 @@ function HistoryDetails(props) {
           !!data &&
             <DescriptionListItem
               title={'Categories'}
-              data={categories}
+              data={categories ? categories : '-'}
             />
         }
 
diff --git a/frontend/src/Indexer/Index/Table/IndexerStatusCell.js b/frontend/src/Indexer/Index/Table/IndexerStatusCell.js
index e8b8e854e..4fd53220c 100644
--- a/frontend/src/Indexer/Index/Table/IndexerStatusCell.js
+++ b/frontend/src/Indexer/Index/Table/IndexerStatusCell.js
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import Icon from 'Components/Icon';
 import VirtualTableRowCell from 'Components/Table/Cells/TableRowCell';
-import { icons } from 'Helpers/Props';
+import { icons, kinds } from 'Helpers/Props';
 import styles from './IndexerStatusCell.css';
 
 function IndexerStatusCell(props) {
@@ -19,12 +19,12 @@ function IndexerStatusCell(props) {
       {...otherProps}
     >
       {
-        !enabled &&
-          <Icon
-            className={styles.statusIcon}
-            name={icons.BLACKLIST}
-            title={enabled ? 'Indexer is Enabled' : 'Indexer is Disabled'}
-          />
+        <Icon
+          className={styles.statusIcon}
+          kind={enabled ? kinds.SUCCESS : kinds.DEFAULT}
+          name={enabled ? icons.CHECK : icons.BLACKLIST}
+          title={enabled ? 'Indexer is Enabled' : 'Indexer is Disabled'}
+        />
       }
     </Component>
   );
diff --git a/frontend/src/Store/Actions/indexerActions.js b/frontend/src/Store/Actions/indexerActions.js
index 17f1c4a36..f7801f847 100644
--- a/frontend/src/Store/Actions/indexerActions.js
+++ b/frontend/src/Store/Actions/indexerActions.js
@@ -99,8 +99,6 @@ function applySchemaDefaults(selectedSchema, schemaDefaults) {
 function selectSchema(state, payload, schemaDefaults) {
   const newState = getSectionState(state, section);
 
-  console.log(payload);
-
   const {
     implementation,
     name
@@ -108,8 +106,6 @@ function selectSchema(state, payload, schemaDefaults) {
 
   const selectedImplementation = _.find(newState.schema, { implementation, name });
 
-  console.log(selectedImplementation);
-
   newState.selectedSchema = applySchemaDefaults(_.cloneDeep(selectedImplementation), schemaDefaults);
 
   return updateSectionState(state, section, newState);