diff --git a/src/lib/components/inputs/DropdownInput.tsx b/src/lib/components/inputs/DropdownInput.tsx
index 44bd373fefe5e9dceaac10fbec69bc57077097f5..00fbbe2628f6cc3a44cc0be500e0b79d6b3f7036 100644
--- a/src/lib/components/inputs/DropdownInput.tsx
+++ b/src/lib/components/inputs/DropdownInput.tsx
@@ -94,6 +94,17 @@ export const DropdownInput = ({
     setFilteredOptions(newFilteredOptions);
   };
 
+  function handleKeyDown(e: React.KeyboardEvent<HTMLInputElement>) {
+    if (e.key === 'Enter') {
+      if (onChange) {
+        onChange(filterInput as string);
+      }
+      if (onKeyDown) {
+        onKeyDown(e);
+      }
+    }
+  }
+
   if (!tooltip && inline) tooltip = label;
 
   return (
@@ -128,7 +139,7 @@ export const DropdownInput = ({
             {overrideRender ? (
               overrideRender
             ) : autocomplete ? (
-              <AutocompleteRenderer onChange={handleInputChange} value={filterInput as string} onKeyDown={onKeyDown} />
+              <AutocompleteRenderer onChange={handleInputChange} value={filterInput as string} onKeyDown={handleKeyDown} />
             ) : null}
           </DropdownTrigger>
           {isDropdownOpen && (
diff --git a/src/lib/querybuilder/pills/customFlowPills/logicpill/QueryLogicPill.tsx b/src/lib/querybuilder/pills/customFlowPills/logicpill/QueryLogicPill.tsx
index 8b552d29cfab27cc6602b95cc7ad212a516d1ea5..ac61eeb03164c7f35a38404efb524da04794931e 100644
--- a/src/lib/querybuilder/pills/customFlowPills/logicpill/QueryLogicPill.tsx
+++ b/src/lib/querybuilder/pills/customFlowPills/logicpill/QueryLogicPill.tsx
@@ -130,7 +130,9 @@ export function QueryLogicPill(node: SchemaReactflowLogicNode) {
                       setLocalInputCache({ ...localInputCache, [input.name]: value });
                       if (execute) onInputUpdated(value, input, i);
                     }}
-                    onExecute={() => onInputUpdated(localInputCache?.[input.name] as string, input, i)}
+                    onExecute={() => {
+                      onInputUpdated(localInputCache?.[input.name] as string, input, i);
+                    }}
                   />
                 ) : (
                   <span className="px-1 m-0 mx-1 p-0 h-5 w-full rounded-sm border-[1px]">
diff --git a/src/lib/vis/visualizations/vis0D/Vis0D.tsx b/src/lib/vis/visualizations/vis0D/Vis0D.tsx
index a25c4d2c29f9a654db97383f3be6bacb9aea9a20..b7f6e3e2a7a02fd7b591b20e5aaac5d9bb3faeff 100644
--- a/src/lib/vis/visualizations/vis0D/Vis0D.tsx
+++ b/src/lib/vis/visualizations/vis0D/Vis0D.tsx
@@ -180,7 +180,7 @@ const Vis0DSettings = ({ settings, graphMetadata, updateSettings }: Visualizatio
         settings.selectedEntity != null &&
         settings.selectedAttribute &&
         statsOptions.length == 0 &&
-        graphMetadata.nodes.types[settings.selectedEntity].attributes[settings.selectedAttribute] != null
+        graphMetadata.nodes?.types?.[settings.selectedEntity]?.attributes?.[settings.selectedAttribute] != null
       ) {
         const attributeSelectedStatistics =
           graphMetadata.nodes.types[settings.selectedEntity].attributes[settings.selectedAttribute].statistics;