diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c290598bf40a..ce1ffea0282cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,8 +39,9 @@ All the nitty gritty details in https://github.com/rerun-io/rerun/pull/8230 and
 ### Undo/Redo support in the viewer
 
 You can now undo/redo blueprint changes in the viewer!
+This video shows it in action and explains how it works:
 
-TODO: embed somehow emil's loom about it
+<video src="https://storage.googleapis.com/rerun-static-img/changelog_0.21_undoredo.mp4" width="600" controls></video>
 
 ### More UI/UX improvements
 
diff --git a/crates/viewer/re_data_ui/src/instance_path.rs b/crates/viewer/re_data_ui/src/instance_path.rs
index c2bdecf82db76..1ed34e3b3ad20 100644
--- a/crates/viewer/re_data_ui/src/instance_path.rs
+++ b/crates/viewer/re_data_ui/src/instance_path.rs
@@ -67,7 +67,7 @@ impl DataUi for InstancePath {
             .filter(|c| c.is_indicator_component())
             .count();
 
-        let components = latest_at(db, query, entity_path, &components);
+        let mut components = latest_at(db, query, entity_path, &components);
 
         if components.is_empty() {
             ui_layout.label(
@@ -89,13 +89,19 @@ impl DataUi for InstancePath {
                 ui,
                 format!(
                     "{} component{} (including {} indicator component{})",
-                    components.len(),
+                    components.len(
                     if components.len() > 1 { "s" } else { "" },
                     indicator_count,
                     if indicator_count > 1 { "s" } else { "" }
                 ),
             );
         } else {
+            if ui_layout == UiLayout::Tooltip {
+                // Niko. nooooooo.
+                components
+                    .retain(|(component, _chunk)| component != &components::GraphEdge::name());
+            }
+
             component_list_ui(
                 ctx,
                 ui,