diff --git a/src/components/Toolbar.jsx b/src/components/Toolbar.jsx
index 6015bc4..368eedd 100644
--- a/src/components/Toolbar.jsx
+++ b/src/components/Toolbar.jsx
@@ -68,25 +68,24 @@ class Toolbar extends React.Component {
           >
             <svg x="0px" y="0px" width="30px" height="20px" viewBox="0 0 30 20" enableBackground="new 0 0 30 20">
               <path d="M24.615,6.793H5.385c-2.761,0-3,0.239-3,3v0.414
-              c0,2.762,0.239,3,3,3h7.621l1.996,2.432l1.996-2.432h7.618c2.762,0,3-0.238,3-3V9.793C27.615,7.032,27.377,6.793,24.615,6.793z"/>
+  c0,2.762,0.239,3,3,3h7.621l1.996,2.432l1.996-2.432h7.618c2.762,0,3-0.238,3-3V9.793C27.615,7.032,27.377,6.793,24.615,6.793z"/>
             </svg>
           </button>
           <button
               className={coeventsClass}
               onClick={() => this.toggleMapViews('coevents')}
           >
-            <svg className="coevents" x="0px" y="0px" width="30px" height="20px" viewBox="0 0 30 20" enableBackground="new 0 0 30 20">
-              <polygon stroke-linejoin="round" stroke-miterlimit="10" points="19.178,20 10.823,20 10.473,14.081
-                10,13.396 10,6.084 20,6.084 20,13.396 19.445,14.021 "/>
-              <rect className="no-fill" x="11.4" y="7.867" width="7.2" height="3.35"/>
-              <line stroke-linejoin="round" stroke-miterlimit="10" x1="12.125" y1="1" x2="12.125" y2="5.35"/>
-              <rect x="11.4" y="4.271" width="1.496" height="1.079"/>
-              <rect x="17.104" y="4.271" width="1.496" height="1.079"/>
+            <svg className="coevents" x="0px" y="0px" width="30px" height="20px" viewBox="0 0 30 20" enableBackground="new 0 0 30 20">
+              <polygon stroke-linejoin="round" stroke-miterlimit="10" points="19.178,20 10.823,20 10.473,14.081
+                10,13.396 10,6.084 20,6.084 20,13.396 19.445,14.021 "/>
+              <rect className="no-fill" x="11.4" y="7.867" width="7.2" height="3.35"/>
+              <line stroke-linejoin="round" stroke-miterlimit="10" x1="12.125" y1="1" x2="12.125" y2="5.35"/>
+              <rect x="11.4" y="4.271" width="1.496" height="1.079"/>
+              <rect x="17.104" y="4.271" width="1.496" height="1.079"/>
             </svg>
           </button>
         </div>
       );
-      return (<div/>)
     }
 
     renderBottomActions() {
diff --git a/src/selectors/index.js b/src/selectors/index.js
index 3d03f02..329ff3e 100644
--- a/src/selectors/index.js
+++ b/src/selectors/index.js
@@ -192,8 +192,9 @@ export const selectTagList = createSelector(
         });
       }
     }
-
-    if (tags.key && tags.children) traverseNode(tags, depth)
+    if (tags && tags !== undefined) {
+      if (tags.key && tags.children) traverseNode(tags, depth)
+    }
     return tagList;
   }
 )