diff --git a/Cargo.lock b/Cargo.lock
index 26ffccd..1874236 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -89,7 +89,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "navi"
-version = "2.0.6"
+version = "2.0.7"
 dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "raw_tty 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/Cargo.toml b/Cargo.toml
index eb91869..5be37a1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "navi"
-version = "2.0.6"
+version = "2.0.7"
 authors = ["Denis Isidoro <denis_isidoro@live.com>"]
 edition = "2018"
 
diff --git a/src/cmds/core.rs b/src/cmds/core.rs
index 504c025..0a69367 100644
--- a/src/cmds/core.rs
+++ b/src/cmds/core.rs
@@ -42,13 +42,16 @@ fn extract_from_selections(raw_output: &str, contains_key: bool) -> (&str, &str,
     } else {
         "enter"
     };
+
     let mut parts = lines.next().unwrap().split(display::DELIMITER);
     parts.next();
     parts.next();
     parts.next();
-    let tags = parts.next().unwrap();
+
+    let tags = parts.next().unwrap_or("");
     parts.next();
-    let snippet = parts.next().unwrap();
+
+    let snippet = parts.next().unwrap_or("");
     (key, tags, snippet)
 }