diff --git a/frontend/components/v2/config-panels/V2SelectConfigPanel.tsx b/frontend/components/v2/config-panels/V2SelectConfigPanel.tsx
index 0abd4a27..d6ba3d94 100644
--- a/frontend/components/v2/config-panels/V2SelectConfigPanel.tsx
+++ b/frontend/components/v2/config-panels/V2SelectConfigPanel.tsx
@@ -166,7 +166,7 @@ const FilterConditionsSection: React.FC<{
 
       <div className="space-y-2">
         {filters.map((filter, index) => (
-          <div key={index} className="space-y-1.5 rounded-md border p-2">
+          <div key={index} className="space-y-2 rounded-md border p-3">
             <div className="flex items-center gap-1.5">
               <Select
                 value={filter.column || ""}
@@ -188,7 +188,7 @@ const FilterConditionsSection: React.FC<{
                 value={filter.operator || "="}
                 onValueChange={(v) => updateFilter(index, { operator: v as V2SelectFilter["operator"] })}
               >
-                <SelectTrigger className="h-7 w-[90px] shrink-0 text-[11px]">
+                <SelectTrigger className="h-7 flex-1 text-[11px]">
                   <SelectValue />
                 </SelectTrigger>
                 <SelectContent>
@@ -205,7 +205,7 @@ const FilterConditionsSection: React.FC<{
                 variant="ghost"
                 size="sm"
                 onClick={() => removeFilter(index)}
-                className="text-destructive h-7 w-7 shrink-0 p-0"
+                className="text-destructive h-8 w-8 shrink-0 p-0"
               >
                 <Trash2 className="h-3 w-3" />
               </Button>
@@ -288,7 +288,7 @@ export const V2SelectConfigPanel: React.FC<V2SelectConfigPanelProps> = ({
   tableName,
   columnName,
 }) => {
-  const isEntityType = inputType === "entity";
+  const isEntityType = inputType === "entity" || config.source === "entity" || !!config.entityTable;
   const isCategoryType = inputType === "category";
 
   const [entityColumns, setEntityColumns] = useState<ColumnOption[]>([]);