diff --git a/core/crates/heavy-lifting/src/file_identifier/tasks/extract_file_metadata.rs b/core/crates/heavy-lifting/src/file_identifier/tasks/extract_file_metadata.rs
index ef9b2af9b..c433bfb00 100644
--- a/core/crates/heavy-lifting/src/file_identifier/tasks/extract_file_metadata.rs
+++ b/core/crates/heavy-lifting/src/file_identifier/tasks/extract_file_metadata.rs
@@ -103,6 +103,9 @@ impl Task<Error> for ExtractFileMetadataTask {
 	}
 
 	async fn run(&mut self, interrupter: &Interrupter) -> Result<ExecStatus, Error> {
+		// `Processed` is larger than `Interrupt`, but it's much more common
+		// so we ignore the size difference to optimize for usage
+		#[allow(clippy::large_enum_variant)]
 		enum StreamMessage {
 			Processed(Uuid, Result<FileMetadata, FileIOError>),
 			Interrupt(InterruptionKind),
diff --git a/core/src/api/locations.rs b/core/src/api/locations.rs
index 3b71df218..a6269f210 100644
--- a/core/src/api/locations.rs
+++ b/core/src/api/locations.rs
@@ -42,7 +42,7 @@ pub enum ExplorerItem {
 		// this tells the frontend if a thumbnail actually exists or not
 		has_created_thumbnail: bool,
 		// we can't actually modify data from PCR types, thats why computed properties are used on ExplorerItem
-		item: file_path_with_object::Data,
+		item: Box<file_path_with_object::Data>,
 	},
 	Object {
 		thumbnail: Option<ThumbnailKey>,
@@ -113,11 +113,8 @@ impl From<UserDirs> for SystemLocations {
 impl ExplorerItem {
 	pub fn name(&self) -> &str {
 		match self {
-			ExplorerItem::Path {
-				item: file_path_with_object::Data { name, .. },
-				..
-			}
-			| ExplorerItem::Location {
+			ExplorerItem::Path { item, .. } => item.name.as_deref().unwrap_or(""),
+			ExplorerItem::Location {
 				item: location::Data { name, .. },
 				..
 			} => name.as_deref().unwrap_or(""),
@@ -128,13 +125,8 @@ impl ExplorerItem {
 
 	pub fn size_in_bytes(&self) -> u64 {
 		match self {
-			ExplorerItem::Path {
-				item: file_path_with_object::Data {
-					size_in_bytes_bytes,
-					..
-				},
-				..
-			} => size_in_bytes_bytes
+			ExplorerItem::Path { item, .. } => item
+				.size_in_bytes_bytes
 				.as_ref()
 				.map(|size| {
 					u64::from_be_bytes([
@@ -165,11 +157,10 @@ impl ExplorerItem {
 
 	pub fn date_created(&self) -> DateTime<Utc> {
 		match self {
-			ExplorerItem::Path {
-				item: file_path_with_object::Data { date_created, .. },
-				..
+			ExplorerItem::Path { item, .. } => {
+				item.date_created.map(Into::into).unwrap_or_default()
 			}
-			| ExplorerItem::Object {
+			ExplorerItem::Object {
 				item: object_with_file_paths::Data { date_created, .. },
 				..
 			}
diff --git a/core/src/api/search/mod.rs b/core/src/api/search/mod.rs
index 203fc2f33..c203431ce 100644
--- a/core/src/api/search/mod.rs
+++ b/core/src/api/search/mod.rs
@@ -233,7 +233,7 @@ pub fn mount() -> AlphaRouter<Ctx> {
 								// .filter(|_| thumbnail_exists_locally)
 								.map(|i| get_indexed_thumb_key(i, library.id)),
 							has_created_thumbnail,
-							item: file_path,
+							item: Box::new(file_path),
 						})
 					}