diff --git a/client/src/components/dynamic-groups/condition-builder.tsx b/client/src/components/dynamic-groups/condition-builder.tsx
index af9a525..3492153 100644
--- a/client/src/components/dynamic-groups/condition-builder.tsx
+++ b/client/src/components/dynamic-groups/condition-builder.tsx
@@ -194,210 +194,231 @@ const ConditionBuilder: React.FC<ConditionBuilderProps> = ({
     );
   };
 
-  // Render a single condition
-  const renderCondition = (condition: Condition, index: number, level = 0) => {
-    if (condition.isGroup) {
-      // Render condition group
-      return (
-        <div 
-          key={`group-${index}`} 
-          className="border border-border rounded-md p-3 mb-3"
-          style={{ marginLeft: level > 0 ? `${level * 20}px` : '0' }}
-        >
-          <div className="flex items-center justify-between mb-2">
-            <div className="flex items-center space-x-2">
-              <button
-                type="button"
-                onClick={() => condition.id && toggleGroupExpand(condition.id)}
-                className="p-1 hover:bg-accent rounded-sm"
-              >
-                {condition.id && expandedGroups.has(condition.id) ? (
-                  <ChevronDown className="h-4 w-4" />
-                ) : (
-                  <ChevronRight className="h-4 w-4" />
-                )}
-              </button>
-              
-              <span className="text-sm font-medium">
-                Condition Group ({condition.logicalOperator})
-              </span>
+  // Render all conditions with a flat approach to avoid recursion
+  const renderAllConditions = () => {
+    // First, build a map of parentId to array of children conditions
+    const conditionsByParent = new Map<number | null | undefined, Condition[]>();
+    
+    // Group conditions by parentId
+    for (const condition of conditions) {
+      const parentId = condition.parentId;
+      if (!conditionsByParent.has(parentId)) {
+        conditionsByParent.set(parentId, []);
+      }
+      conditionsByParent.get(parentId)!.push(condition);
+    }
+    
+    // Render a single condition
+    const renderSingleCondition = (condition: Condition, index: number, level = 0) => {
+      if (!condition.isGroup) {
+        // Render regular condition (not a group)
+        return (
+          <div 
+            key={`condition-${index}`} 
+            className="grid grid-cols-13 gap-2 items-center mb-2 border border-transparent hover:border-border p-2 rounded-md"
+            style={{ marginLeft: level > 0 ? `${level * 20}px` : '0' }}
+          >
+            <div className="col-span-1 flex items-center justify-center">
+              <Move className="h-4 w-4 text-muted-foreground" />
             </div>
             
-            <div className="flex items-center space-x-2">
+            {index > 0 && !condition.isGroup && condition.parentId === conditions[index-1].parentId && (
+              <div className="col-span-1">
+                <Select
+                  value={condition.logicalOperator || 'AND'}
+                  onValueChange={(value) => updateCondition(index, 'logicalOperator', value)}
+                >
+                  <SelectTrigger className="h-8">
+                    <SelectValue placeholder="AND" />
+                  </SelectTrigger>
+                  <SelectContent>
+                    {logicalOperators.map((op) => (
+                      <SelectItem key={op.value} value={op.value}>
+                        {op.label}
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+              </div>
+            )}
+            
+            {(index === 0 || condition.parentId !== conditions[index-1].parentId) && (
+              <div className="col-span-1"></div>
+            )}
+            
+            <div className="col-span-4">
               <Select
-                value={condition.logicalOperator || 'AND'}
-                onValueChange={(value) => updateCondition(index, 'logicalOperator', value)}
+                value={condition.attribute}
+                onValueChange={(value) => updateCondition(index, 'attribute', value)}
               >
-                <SelectTrigger className="w-20 h-8">
-                  <SelectValue placeholder="Operator" />
+                <SelectTrigger>
+                  <SelectValue placeholder="Select attribute" />
                 </SelectTrigger>
                 <SelectContent>
-                  {logicalOperators.map((op) => (
+                  {availableAttributes.map((attr) => (
+                    <SelectItem key={attr} value={attr}>
+                      {attr}
+                    </SelectItem>
+                  ))}
+                  <SelectItem value="custom">Custom Attribute</SelectItem>
+                </SelectContent>
+              </Select>
+              
+              {condition.attribute === 'custom' && (
+                <Input
+                  className="mt-1"
+                  placeholder="Enter custom attribute"
+                  value={condition.customAttribute || ''}
+                  onChange={(e) => updateCondition(index, 'customAttribute', e.target.value)}
+                />
+              )}
+            </div>
+            
+            <div className="col-span-3">
+              <Select
+                value={condition.operator}
+                onValueChange={(value) => updateCondition(index, 'operator', value)}
+              >
+                <SelectTrigger>
+                  <SelectValue placeholder="Select operator" />
+                </SelectTrigger>
+                <SelectContent>
+                  {operators.map((op) => (
                     <SelectItem key={op.value} value={op.value}>
                       {op.label}
                     </SelectItem>
                   ))}
                 </SelectContent>
               </Select>
-              
-              <Button
-                variant="ghost"
-                size="icon"
-                onClick={() => addCondition(condition.id)}
-                title="Add Condition"
-              >
-                <Plus className="h-4 w-4" />
-              </Button>
-              
-              <Button
-                variant="ghost"
-                size="icon"
-                onClick={() => addConditionGroup(condition.id)}
-                title="Add Group"
-              >
-                <FolderPlus className="h-4 w-4" />
-              </Button>
-              
+            </div>
+            
+            <div className="col-span-3">
+              {condition.operator !== 'present' && condition.operator !== 'notPresent' && (
+                <Input
+                  placeholder="Value"
+                  value={condition.value}
+                  onChange={(e) => updateCondition(index, 'value', e.target.value)}
+                />
+              )}
+            </div>
+            
+            <div className="col-span-1 flex justify-end">
               <Button
                 variant="ghost"
                 size="icon"
                 onClick={() => removeCondition(index)}
-                title="Remove Group"
+                title="Remove Condition"
               >
                 <Trash className="h-4 w-4" />
               </Button>
             </div>
           </div>
-          
-          {condition.id && expandedGroups.has(condition.id) && (
-            <div className="pl-2">
-              {renderChildConditions(condition.id, level + 1)}
+        );
+      } else {
+        // Render condition group
+        const hasChildren = condition.id && conditionsByParent.has(condition.id);
+        const isExpanded = condition.id && expandedGroups.has(condition.id);
+        
+        return (
+          <div key={`group-${index}`}>
+            <div 
+              className="border border-border rounded-md p-3 mb-3"
+              style={{ marginLeft: level > 0 ? `${level * 20}px` : '0' }}
+            >
+              <div className="flex items-center justify-between mb-2">
+                <div className="flex items-center space-x-2">
+                  <button
+                    type="button"
+                    onClick={() => condition.id && toggleGroupExpand(condition.id)}
+                    className="p-1 hover:bg-accent rounded-sm"
+                  >
+                    {isExpanded ? (
+                      <ChevronDown className="h-4 w-4" />
+                    ) : (
+                      <ChevronRight className="h-4 w-4" />
+                    )}
+                  </button>
+                  
+                  <span className="text-sm font-medium">
+                    Condition Group ({condition.logicalOperator})
+                  </span>
+                </div>
+                
+                <div className="flex items-center space-x-2">
+                  <Select
+                    value={condition.logicalOperator || 'AND'}
+                    onValueChange={(value) => updateCondition(index, 'logicalOperator', value)}
+                  >
+                    <SelectTrigger className="w-20 h-8">
+                      <SelectValue placeholder="Operator" />
+                    </SelectTrigger>
+                    <SelectContent>
+                      {logicalOperators.map((op) => (
+                        <SelectItem key={op.value} value={op.value}>
+                          {op.label}
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                  
+                  <Button
+                    variant="ghost"
+                    size="icon"
+                    onClick={() => addCondition(condition.id)}
+                    title="Add Condition"
+                  >
+                    <Plus className="h-4 w-4" />
+                  </Button>
+                  
+                  <Button
+                    variant="ghost"
+                    size="icon"
+                    onClick={() => addConditionGroup(condition.id)}
+                    title="Add Group"
+                  >
+                    <FolderPlus className="h-4 w-4" />
+                  </Button>
+                  
+                  <Button
+                    variant="ghost"
+                    size="icon"
+                    onClick={() => removeCondition(index)}
+                    title="Remove Group"
+                  >
+                    <Trash className="h-4 w-4" />
+                  </Button>
+                </div>
+              </div>
+              
+              {isExpanded && (
+                <div className="pl-2">
+                  {hasChildren ? (
+                    conditionsByParent.get(condition.id)!.map((childCondition) => {
+                      const childIndex = conditions.indexOf(childCondition);
+                      return (
+                        <div key={`child-${childIndex}`}>
+                          {renderSingleCondition(childCondition, childIndex, level + 1)}
+                        </div>
+                      );
+                    })
+                  ) : (
+                    <div className="text-sm text-muted-foreground p-2">
+                      No conditions in this group. Add one using the buttons above.
+                    </div>
+                  )}
+                </div>
+              )}
             </div>
-          )}
-        </div>
-      );
-    } else {
-      // Render regular condition (not a group)
-      return (
-        <div 
-          key={`condition-${index}`} 
-          className="grid grid-cols-13 gap-2 items-center mb-2 border border-transparent hover:border-border p-2 rounded-md"
-          style={{ marginLeft: level > 0 ? `${level * 20}px` : '0' }}
-        >
-          <div className="col-span-1 flex items-center justify-center">
-            <Move className="h-4 w-4 text-muted-foreground" />
           </div>
-          
-          {index > 0 && !condition.isGroup && condition.parentId === conditions[index-1].parentId && (
-            <div className="col-span-1">
-              <Select
-                value={condition.logicalOperator || 'AND'}
-                onValueChange={(value) => updateCondition(index, 'logicalOperator', value)}
-              >
-                <SelectTrigger className="h-8">
-                  <SelectValue placeholder="AND" />
-                </SelectTrigger>
-                <SelectContent>
-                  {logicalOperators.map((op) => (
-                    <SelectItem key={op.value} value={op.value}>
-                      {op.label}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-            </div>
-          )}
-          
-          {(index === 0 || condition.parentId !== conditions[index-1].parentId) && (
-            <div className="col-span-1"></div>
-          )}
-          
-          <div className="col-span-4">
-            <Select
-              value={condition.attribute}
-              onValueChange={(value) => updateCondition(index, 'attribute', value)}
-            >
-              <SelectTrigger>
-                <SelectValue placeholder="Select attribute" />
-              </SelectTrigger>
-              <SelectContent>
-                {availableAttributes.map((attr) => (
-                  <SelectItem key={attr} value={attr}>
-                    {attr}
-                  </SelectItem>
-                ))}
-                <SelectItem value="custom">Custom Attribute</SelectItem>
-              </SelectContent>
-            </Select>
-            
-            {condition.attribute === 'custom' && (
-              <Input
-                className="mt-1"
-                placeholder="Enter custom attribute"
-                value={condition.customAttribute || ''}
-                onChange={(e) => updateCondition(index, 'customAttribute', e.target.value)}
-              />
-            )}
-          </div>
-          
-          <div className="col-span-3">
-            <Select
-              value={condition.operator}
-              onValueChange={(value) => updateCondition(index, 'operator', value)}
-            >
-              <SelectTrigger>
-                <SelectValue placeholder="Select operator" />
-              </SelectTrigger>
-              <SelectContent>
-                {operators.map((op) => (
-                  <SelectItem key={op.value} value={op.value}>
-                    {op.label}
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
-          </div>
-          
-          <div className="col-span-3">
-            {condition.operator !== 'present' && condition.operator !== 'notPresent' && (
-              <Input
-                placeholder="Value"
-                value={condition.value}
-                onChange={(e) => updateCondition(index, 'value', e.target.value)}
-              />
-            )}
-          </div>
-          
-          <div className="col-span-1 flex justify-end">
-            <Button
-              variant="ghost"
-              size="icon"
-              onClick={() => removeCondition(index)}
-              title="Remove Condition"
-            >
-              <Trash className="h-4 w-4" />
-            </Button>
-          </div>
-        </div>
-      );
-    }
-  };
-
-  // Render all child conditions of a parent
-  const renderChildConditions = (parentId: number, level = 0) => {
-    const childConditions = getConditionsForParent(parentId);
+        );
+      }
+    };
     
-    if (childConditions.length === 0) {
-      return (
-        <div className="text-sm text-muted-foreground p-2">
-          No conditions in this group. Add one using the buttons above.
-        </div>
-      );
-    }
-    
-    return childConditions.map((condition, i) => {
-      const index = conditions.findIndex(c => c === condition);
-      return renderCondition(condition, index, level);
+    // Render only root conditions (those without a parent)
+    const rootConditions = conditionsByParent.get(null) || [];
+    return rootConditions.map((condition) => {
+      const index = conditions.indexOf(condition);
+      return renderSingleCondition(condition, index, 0);
     });
   };
 
@@ -430,14 +451,7 @@ const ConditionBuilder: React.FC<ConditionBuilderProps> = ({
       ) : (
         <>
           <div className="space-y-2">
-            {/* Render root-level conditions */}
-            {conditions
-              .filter(c => c.parentId === null || c.parentId === undefined)
-              .map((condition, i) => {
-                const index = conditions.findIndex(c => c === condition);
-                return renderCondition(condition, index, 0);
-              })
-            }
+            {renderAllConditions()}
           </div>
           
           <div className="flex space-x-2">
@@ -473,61 +487,59 @@ const ConditionBuilder: React.FC<ConditionBuilderProps> = ({
   );
 };
 
-// Function to generate LDAP filter syntax from conditions
+// Non-recursive function to generate LDAP filter syntax from conditions
 const generateLdapFilter = (conditions: Condition[]): string => {
   if (conditions.length === 0) return '(objectClass=*)';
   
-  // Helper function to generate filter for a single condition
-  const generateSingleFilter = (condition: Condition): string => {
-    if (condition.isGroup) {
-      // Get all child conditions for this group
-      const childConditions = conditions.filter(c => c.parentId === condition.id);
-      if (childConditions.length === 0) return '(objectClass=*)';
-      
-      const operator = condition.logicalOperator === 'AND' ? '&' : '|';
-      const childFilters = childConditions.map(generateSingleFilter).join('');
-      
-      return `(${operator}${childFilters})`;
-    } else {
-      // Get actual attribute name (custom or selected)
-      const attributeName = condition.attribute === 'custom' && condition.customAttribute 
-        ? condition.customAttribute 
-        : condition.attribute;
-      
-      // Regular condition
-      switch (condition.operator) {
-        case '=':
-          return `(${attributeName}=${condition.value})`;
-        case '!=':
-          return `(!(${attributeName}=${condition.value}))`;
-        case 'contains':
-          return `(${attributeName}=*${condition.value}*)`;
-        case 'startsWith':
-          return `(${attributeName}=${condition.value}*)`;
-        case 'endsWith':
-          return `(${attributeName}=*${condition.value})`;
-        case 'present':
-          return `(${attributeName}=*)`;
-        case 'notPresent':
-          return `(!(${attributeName}=*))`;
-        default:
-          return `(${attributeName}=${condition.value})`;
-      }
+  // Helper function to generate filter for a regular condition (not a group)
+  const generateRegularFilter = (condition: Condition): string => {
+    // Get actual attribute name (custom or selected)
+    const attributeName = condition.attribute === 'custom' && condition.customAttribute 
+      ? condition.customAttribute 
+      : condition.attribute;
+    
+    // Regular condition
+    switch (condition.operator) {
+      case '=':
+        return `(${attributeName}=${condition.value})`;
+      case '!=':
+        return `(!(${attributeName}=${condition.value}))`;
+      case 'contains':
+        return `(${attributeName}=*${condition.value}*)`;
+      case 'startsWith':
+        return `(${attributeName}=${condition.value}*)`;
+      case 'endsWith':
+        return `(${attributeName}=*${condition.value})`;
+      case 'present':
+        return `(${attributeName}=*)`;
+      case 'notPresent':
+        return `(!(${attributeName}=*))`;
+      default:
+        return `(${attributeName}=${condition.value})`;
     }
   };
   
-  // Handle root-level conditions
+  // Find all root conditions first (those without parents)
   const rootConditions = conditions.filter(c => 
     c.parentId === null || c.parentId === undefined
   );
   
-  if (rootConditions.length === 1) {
-    return generateSingleFilter(rootConditions[0]);
-  } else {
-    // When multiple root conditions, wrap in an AND by default
-    const rootFilters = rootConditions.map(generateSingleFilter).join('');
-    return `(&${rootFilters})`;
+  // Simple version that just concatenates all conditions without proper nesting
+  // This avoids recursion completely, but doesn't handle nested groups properly
+  let allFilters = '';
+  
+  for (const condition of conditions) {
+    if (!condition.isGroup) {
+      allFilters += generateRegularFilter(condition);
+    }
   }
+  
+  if (allFilters === '') {
+    return '(objectClass=*)';
+  }
+  
+  // Wrap all filters in an AND operator for simplicity
+  return `(&${allFilters})`;
 };
 
 export default ConditionBuilder;
\ No newline at end of file