diff --git a/src/database/media.rs b/src/database/media.rs
index a92164f..f2caa11 100644
--- a/src/database/media.rs
+++ b/src/database/media.rs
@@ -106,9 +106,9 @@ impl Media {
         prefix.extend_from_slice(&0_u32.to_be_bytes()); // Height = 0 if it's not a thumbnail
         prefix.push(0xff);
 
-        if let Some(r) = self.mediaid_file.scan_prefix(&prefix).next() {
-            let (key, _file) = r?;
-            let path = globals.get_media_file(&key.to_vec());
+        if let Some(r) = self.mediaid_file.scan_prefix(&prefix).keys().next() {
+            let key = r?;
+            let path = globals.get_media_file(&key);
             let mut file = vec![];
             File::open(path).await?.read_to_end(&mut file).await?;
             let mut parts = key.rsplit(|&b| b == 0xff);
@@ -195,10 +195,10 @@ impl Media {
         original_prefix.extend_from_slice(&0_u32.to_be_bytes()); // Height = 0 if it's not a thumbnail
         original_prefix.push(0xff);
 
-        if let Some(r) = self.mediaid_file.scan_prefix(&thumbnail_prefix).next() {
+        if let Some(r) = self.mediaid_file.scan_prefix(&thumbnail_prefix).keys().next() {
             // Using saved thumbnail
-            let (key, _file) = r?;
-            let path = globals.get_media_file(&key.to_vec());
+            let key = r?;
+            let path = globals.get_media_file(&key);
             let mut file = vec![];
             File::open(path).await?.read_to_end(&mut file).await?;
             let mut parts = key.rsplit(|&b| b == 0xff);
@@ -231,11 +231,11 @@ impl Media {
                 content_type,
                 file: file.to_vec(),
             }))
-        } else if let Some(r) = self.mediaid_file.scan_prefix(&original_prefix).next() {
+        } else if let Some(r) = self.mediaid_file.scan_prefix(&original_prefix).keys().next() {
             // Generate a thumbnail
 
-            let (key, _file) = r?;
-            let path = globals.get_media_file(&key.to_vec());
+            let key = r?;
+            let path = globals.get_media_file(&key);
             let mut file = vec![];
             File::open(path).await?.read_to_end(&mut file).await?;