diff --git a/crates/database/src/main.rs b/crates/database/src/main.rs
index 21e8e1e..cde4ff4 100644
--- a/crates/database/src/main.rs
+++ b/crates/database/src/main.rs
@@ -71,12 +71,12 @@ pub fn print_graph_display_data(data_buffer: &GraphDisplayData) {
         .zip(data_buffer.labels.iter())
         .enumerate()
     {
-        info!("{index}: {element:?} -> {label}");
+        info!("{index}: {element:?} -> {label:?}");
     }
     info!("--- Edges ---");
     for edge in data_buffer.edges.iter() {
         info!(
-            "{} -> {:?} -> {}",
+            "{:?} -> {:?} -> {:?}",
             data_buffer.labels[edge[0]], data_buffer.elements[edge[1]], data_buffer.labels[edge[2]]
         );
     }
diff --git a/crates/database/src/serializers.rs b/crates/database/src/serializers.rs
index 1fa49c4..25b1a27 100644
--- a/crates/database/src/serializers.rs
+++ b/crates/database/src/serializers.rs
@@ -287,19 +287,12 @@ impl From<SerializationDataBuffer> for GraphDisplayData {
         let mut iricache: HashMap<Term, usize> = HashMap::new();
         for (iri, element) in val.node_element_buffer.into_iter() {
             let label = val.label_buffer.remove(&iri);
-            match label {
-                Some(label) => {
-                    display_data.labels.push(label);
-                    display_data.elements.push(element);
-                    iricache.insert(iri, display_data.elements.len() - 1);
-                }
-                None => {
-                    error!("Label not found for iri: {}, using default", iri);
-                    display_data.labels.push(element.to_string());
-                    display_data.elements.push(element);
-                    iricache.insert(iri, display_data.elements.len() - 1);
-                }
+            if label.is_none() {
+                error!("Label not found for iri: {}, using None", iri);
             }
+            display_data.labels.push(label);
+            display_data.elements.push(element);
+            iricache.insert(iri, display_data.elements.len() - 1);
         }
 
         for edge in val.edge_buffer.iter() {
@@ -311,7 +304,7 @@ impl From<SerializationDataBuffer> for GraphDisplayData {
             match (subject_idx, object_idx, maybe_label) {
                 (Some(subject_idx), Some(object_idx), Some(label)) => {
                     display_data.elements.push(edge.element_type);
-                    display_data.labels.push(label);
+                    display_data.labels.push(Some(label));
                     display_data.edges.push([
                         *subject_idx,
                         display_data.elements.len() - 1,