diff --git a/src/browser/modules/DatabaseInfo/MetaItems.jsx b/src/browser/modules/DatabaseInfo/MetaItems.jsx
index 8bd1497724c..2a9667448ec 100644
--- a/src/browser/modules/DatabaseInfo/MetaItems.jsx
+++ b/src/browser/modules/DatabaseInfo/MetaItems.jsx
@@ -64,9 +64,10 @@ const createItems = (
     items.unshift('*')
   }
   return items.map((text, index) => {
-    const getNodesCypher = editorCommandTemplate(text)
+    const getNodesCypher = editorCommandTemplate(text, index)
     return (
       <RenderType.component
+        data-test-id='sidebarMetaItem'
         key={index}
         onClick={() => onItemClick(getNodesCypher)}
       >
@@ -76,7 +77,7 @@ const createItems = (
   })
 }
 const LabelItems = ({
-  labels,
+  labels = [],
   totalNumItems,
   onItemClick,
   moreStep,
@@ -84,8 +85,8 @@ const LabelItems = ({
 }) => {
   let labelItems = <p>There are no labels in database</p>
   if (labels.length) {
-    const editorCommandTemplate = text => {
-      if (text === '*') {
+    const editorCommandTemplate = (text, i) => {
+      if (i === 0) {
         return 'MATCH (n) RETURN n LIMIT 25'
       }
       return `MATCH (n:${ecsapeCypherMetaItem(text)}) RETURN n LIMIT 25`
@@ -117,7 +118,7 @@ const LabelItems = ({
   )
 }
 const RelationshipItems = ({
-  relationshipTypes,
+  relationshipTypes = [],
   totalNumItems,
   onItemClick,
   moreStep,
@@ -125,8 +126,8 @@ const RelationshipItems = ({
 }) => {
   let relationshipItems = <p>No relationships in database</p>
   if (relationshipTypes.length > 0) {
-    const editorCommandTemplate = text => {
-      if (text === '*') {
+    const editorCommandTemplate = (text, i) => {
+      if (i === 0) {
         return 'MATCH p=()-->() RETURN p LIMIT 25'
       }
       return `MATCH p=()-[r:${ecsapeCypherMetaItem(
diff --git a/src/browser/modules/DatabaseInfo/MetaItems.test.js b/src/browser/modules/DatabaseInfo/MetaItems.test.js
new file mode 100644
index 00000000000..d463143c39f
--- /dev/null
+++ b/src/browser/modules/DatabaseInfo/MetaItems.test.js
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2002-2017 "Neo Technology,"
+ * Network Engine for Objects in Lund AB [http://neotechnology.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Neo4j is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* global jest, test, expect */
+
+import { mount } from 'services/testUtils'
+import { ecsapeCypherMetaItem } from 'services/utils'
+import { LabelItems, RelationshipItems } from './MetaItems.jsx'
+
+test('LabelItems detects user defined label named * and creates query correctly', () => {
+  // Given
+  const onItemClick = jest.fn()
+  const labels = ['*', 'Label1']
+
+  // When
+  return mount(LabelItems)
+    .withProps({
+      labels,
+      totalNumItems: labels.length,
+      onItemClick
+    })
+    .then(wrapper => {
+      const items = wrapper.find(`[data-test-id='sidebarMetaItem']`)
+      items.forEach((item, i) => {
+        const element = item.get(0)
+        element.click()
+        const expectedCall =
+          i === 0
+            ? 'MATCH (n) RETURN n LIMIT 25'
+            : `MATCH (n:${ecsapeCypherMetaItem(item.text())}) RETURN n LIMIT 25`
+        expect(onItemClick).toHaveBeenLastCalledWith(expectedCall)
+      })
+    })
+})
+
+test('RelationshipItems detects user defined relType named * and creates query correctly', () => {
+  // Given
+  const onItemClick = jest.fn()
+  const relationshipTypes = ['*', 'TYPE1']
+
+  // When
+  return mount(RelationshipItems)
+    .withProps({
+      relationshipTypes,
+      totalNumItems: relationshipTypes.length,
+      onItemClick
+    })
+    .then(wrapper => {
+      const items = wrapper.find(`[data-test-id='sidebarMetaItem']`)
+      items.forEach((item, i) => {
+        const element = item.get(0)
+        element.click()
+        const expectedCall =
+          i === 0
+            ? 'MATCH p=()-->() RETURN p LIMIT 25'
+            : `MATCH p=()-[r:${ecsapeCypherMetaItem(
+              item.text()
+            )}]->() RETURN p LIMIT 25`
+        expect(onItemClick).toHaveBeenLastCalledWith(expectedCall)
+      })
+    })
+})