diff --git a/src/index.rs b/src/index.rs
index a48eb11..2969ccf 100644
--- a/src/index.rs
+++ b/src/index.rs
@@ -62,7 +62,7 @@ impl Index {
         infohash: String,
         node: u64,
         size: u64,
-        list: Option<Vec<(String, u64)>>,
+        list: Option<Vec<(Option<String>, u64)>>,
         name: Option<String>,
     ) {
         if self
diff --git a/src/index/value.rs b/src/index/value.rs
index de50e47..e10c306 100644
--- a/src/index/value.rs
+++ b/src/index/value.rs
@@ -8,7 +8,7 @@ pub struct Value {
     // Isolate by applying internal filter on value set
     size: Option<u64>,
     name: Option<String>,
-    list: Option<Vec<(String, u64)>>,
+    list: Option<Vec<(Option<String>, u64)>>,
 }
 
 impl Value {
@@ -17,14 +17,14 @@ impl Value {
         node: u64,
         size: Option<u64>,
         name: Option<String>,
-        list: Option<Vec<(String, u64)>>,
+        list: Option<Vec<(Option<String>, u64)>>,
     ) -> Self {
         Self {
             time: Utc::now(),
             node,
             size,
-            list: filter_list(list),
-            name: filter_name(name),
+            list: list.map(|f| f.into_iter().map(|(n, l)| (filter(n), l)).collect()),
+            name: filter(name),
         }
     }
     /// Get reference to the safely constructed `name` member
@@ -32,7 +32,7 @@ impl Value {
         self.name.as_ref()
     }
     /// Get reference to the safely constructed files `list` member
-    pub fn list(&self) -> Option<&Vec<(String, u64)>> {
+    pub fn list(&self) -> Option<&Vec<(Option<String>, u64)>> {
         self.list.as_ref()
     }
     /// Get reference to the safely constructed `length` member
@@ -41,20 +41,14 @@ impl Value {
     }
 }
 
-fn filter_name(value: Option<String>) -> Option<String> {
-    value.map(filter)
-}
-
-fn filter_list(value: Option<Vec<(String, u64)>>) -> Option<Vec<(String, u64)>> {
-    value.map(|f| f.into_iter().map(|(n, l)| (filter(n), l)).collect())
-}
-
 /// Strip tags and bom chars, crop long strings (prevents memory pool overload)
-fn filter(value: String) -> String {
-    const C: usize = 125; // + 3 for `...` offset, 128 chars max @TODO optional
-    let s = value._strip_bom()._strip_tags();
-    if s.chars().count() > C {
-        return format!("{}...", s.chars().take(C).collect::<String>());
-    }
-    s
+fn filter(value: Option<String>) -> Option<String> {
+    value.map(|v| {
+        const C: usize = 125; // + 3 for `...` offset, 128 chars max @TODO optional
+        let s = v._strip_bom()._strip_tags();
+        if s.chars().count() > C {
+            return format!("{}...", s.chars().take(C).collect::<String>());
+        }
+        s
+    })
 }
diff --git a/src/main.rs b/src/main.rs
index 84dcaa3..846837e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -363,7 +363,10 @@ fn size(info: &TorrentMetaV1Info<ByteBufOwned>) -> u64 {
     t
 }
 
-fn list(info: &TorrentMetaV1Info<ByteBufOwned>, limit: usize) -> Option<Vec<(String, u64)>> {
+fn list(
+    info: &TorrentMetaV1Info<ByteBufOwned>,
+    limit: usize,
+) -> Option<Vec<(Option<String>, u64)>> {
     info.files.as_ref().map(|files| {
         let mut b = Vec::with_capacity(files.len());
         let mut i = files.iter();
@@ -387,7 +390,7 @@ fn list(info: &TorrentMetaV1Info<ByteBufOwned>, limit: usize) -> Option<Vec<(Str
                             })
                             .collect(),
                     )
-                    .unwrap_or_default(),
+                    .ok(),
                     f.length,
                 ));
                 continue;
@@ -397,7 +400,7 @@ fn list(info: &TorrentMetaV1Info<ByteBufOwned>, limit: usize) -> Option<Vec<(Str
             for f in i.by_ref() {
                 l += f.length
             }
-            b.push(("...".to_string(), l));
+            b.push((Some("...".to_string()), l));
             break;
         }
         b[..t].sort_by(|a, b| a.0.cmp(&b.0)); // @TODO optional
diff --git a/src/rss.rs b/src/rss.rs
index 12d2ea6..8a1de14 100644
--- a/src/rss.rs
+++ b/src/rss.rs
@@ -104,7 +104,10 @@ impl Rss {
     }
 }
 
-pub fn item_description(size: Option<u64>, list: Option<&Vec<(String, u64)>>) -> Option<String> {
+pub fn item_description(
+    size: Option<u64>,
+    list: Option<&Vec<(Option<String>, u64)>>,
+) -> Option<String> {
     use crate::format::Format;
     if size.is_none() && list.is_none() {
         return None;
@@ -115,7 +118,11 @@ pub fn item_description(size: Option<u64>, list: Option<&Vec<(String, u64)>>) ->
     }
     if let Some(l) = list {
         for (path, size) in l {
-            b.push(format!("{path} ({})", size.bytes()))
+            b.push(format!(
+                "{} ({})",
+                path.as_deref().unwrap_or("?"), // @TODO invalid encoding
+                size.bytes()
+            ))
         }
     }
     Some(b.join("\n"))