diff --git a/pom.xml b/pom.xml
index a352999..8f64b39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.erikmafo</groupId>
     <artifactId>bigtableviewer</artifactId>
-    <version>0.2.5</version>
+    <version>0.2.7</version>
     <packaging>jar</packaging>
     <name>bigtableviewer</name>
 
diff --git a/src/main/java/com/erikmafo/btviewer/components/BigtableViewController.java b/src/main/java/com/erikmafo/btviewer/components/BigtableViewController.java
index a82354a..0530214 100644
--- a/src/main/java/com/erikmafo/btviewer/components/BigtableViewController.java
+++ b/src/main/java/com/erikmafo/btviewer/components/BigtableViewController.java
@@ -166,9 +166,9 @@ private String getCellValue(TreeTablePosition<BigtableRow, ?> position) {
     private TreeTableColumn<BigtableRow, String> createRowKeyColumn() {
         TreeTableColumn<BigtableRow, String> tableColumn = new TreeTableColumn<>(ROW_KEY);
         tableColumn.setCellValueFactory(param -> new ReadOnlyObjectWrapper<>(param.getValue().getValue().getRowKey()));
-        tableColumn.setCellValueFactory(features -> features.getValue().isLeaf() ?
-                new ReadOnlyStringWrapper("") :
-                new ReadOnlyObjectWrapper<>(features.getValue().getValue().getRowKey()));
+        tableColumn.setCellValueFactory(features -> features.getValue().getParent() == root ?
+                new ReadOnlyStringWrapper(features.getValue().getValue().getRowKey()) :
+                new ReadOnlyStringWrapper(""));
         tableColumn.setCellFactory(new RowCellFactory());
         return tableColumn;
     }
diff --git a/src/main/java/com/erikmafo/btviewer/components/CellView.java b/src/main/java/com/erikmafo/btviewer/components/CellView.java
index abeb20e..f73c7ec 100644
--- a/src/main/java/com/erikmafo/btviewer/components/CellView.java
+++ b/src/main/java/com/erikmafo/btviewer/components/CellView.java
@@ -59,7 +59,7 @@ public BooleanProperty displayTimestampProperty() {
     private String getDisplayValue() {
 
         if (cell.getValue() == null) {
-            return "null";
+            return "";
         }
 
         if (valueConverter.getValue() == null) {