diff --git a/packages/builder/src/userInterface/ComponentSelectionList.svelte b/packages/builder/src/userInterface/ComponentSelectionList.svelte
index 19ce097775..91f5c73a74 100644
--- a/packages/builder/src/userInterface/ComponentSelectionList.svelte
+++ b/packages/builder/src/userInterface/ComponentSelectionList.svelte
@@ -116,7 +116,6 @@
     </ul>
 
     {#if componentLibrary}
-      {#each $store.builtins.concat(componentLibrary.components) as component}
       {#each generate_components_list(componentLibrary.components) as component}
         <div class="component-container">
           <div
diff --git a/packages/builder/src/userInterface/ComponentsHierarchy.svelte b/packages/builder/src/userInterface/ComponentsHierarchy.svelte
index 0f2a19068d..297ebe2f79 100644
--- a/packages/builder/src/userInterface/ComponentsHierarchy.svelte
+++ b/packages/builder/src/userInterface/ComponentsHierarchy.svelte
@@ -25,8 +25,12 @@
       ]
     )
 
-  const lastPartOfName = c =>
-    c && last(c.name ? c.name.split("/") : c._component.split("/"))
+  const lastPartOfName = c => {
+    if (!c) return ""
+    const name = c.name ? c.name : c._component ? c._component : c
+    return last(name.split("/"))
+  }
+
 
   const isComponentSelected = (current, comp) => current === comp