diff --git a/packages/ui/feature-builder-form-controls/src/lib/components/array-form-control/array-form-control.component.html b/packages/ui/feature-builder-form-controls/src/lib/components/array-form-control/array-form-control.component.html
index a6d565fdd5..b485177881 100644
--- a/packages/ui/feature-builder-form-controls/src/lib/components/array-form-control/array-form-control.component.html
+++ b/packages/ui/feature-builder-form-controls/src/lib/components/array-form-control/array-form-control.component.html
@@ -3,7 +3,8 @@
     <div class="ap-select-none">
       {{ property.displayName }}
     </div>
-    <ng-container *ngTemplateOutlet="dynamicInputTemplate"></ng-container>
+    <ng-content></ng-content>
+    
   </div>
 
   @if(!!property.properties)
diff --git a/packages/ui/feature-builder-form-controls/src/lib/components/array-form-control/array-form-control.component.ts b/packages/ui/feature-builder-form-controls/src/lib/components/array-form-control/array-form-control.component.ts
index c319e17c5a..e628c543e4 100644
--- a/packages/ui/feature-builder-form-controls/src/lib/components/array-form-control/array-form-control.component.ts
+++ b/packages/ui/feature-builder-form-controls/src/lib/components/array-form-control/array-form-control.component.ts
@@ -3,7 +3,6 @@ import {
   ChangeDetectorRef,
   Component,
   Input,
-  TemplateRef,
   ViewChild,
 } from '@angular/core';
 import {
@@ -50,7 +49,6 @@ export class ArrayFormControlComponent
 {
   formArray: FormArray<FormControl<string> | UntypedFormGroup>;
   @Input({ required: true }) property: ArrayProperty<boolean>;
-  @Input() dynamicInputTemplate: TemplateRef<unknown>;
   @ViewChild('textControl') firstInput: InterpolatingTextFormControlComponent;
   @Input({ required: true }) pieceMetaData: PieceMetadataModel;
   @Input({ required: true }) flow: Pick<PopulatedFlow, 'id' | 'version'>;
diff --git a/packages/ui/feature-builder-form-controls/src/lib/components/new-piece-properties-form/piece-properties-form.component.ts b/packages/ui/feature-builder-form-controls/src/lib/components/new-piece-properties-form/piece-properties-form.component.ts
index 83d3159cfd..a06566ab7f 100644
--- a/packages/ui/feature-builder-form-controls/src/lib/components/new-piece-properties-form/piece-properties-form.component.ts
+++ b/packages/ui/feature-builder-form-controls/src/lib/components/new-piece-properties-form/piece-properties-form.component.ts
@@ -15,7 +15,10 @@ import {
   PiecePropertyMap,
   PropertyType,
 } from '@activepieces/pieces-framework';
-import { jsonValidator } from '@activepieces/ui/common';
+import {
+  getPropertyInitialValue,
+  jsonValidator,
+} from '@activepieces/ui/common';
 import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { BehaviorSubject, Observable, distinctUntilChanged, tap } from 'rxjs';
 import deepEqual from 'deep-equal';
@@ -129,8 +132,12 @@ export class PiecePropertiesFormComponent
         this.form.controls[propertyName].addValidators(jsonValidator);
       }
     }
+
     this.customizedInputsChanged.emit({ propertyName, value });
-    this.form.controls[propertyName].setValue('', { emitEvent: false });
+    this.form.controls[propertyName].setValue(
+      getPropertyInitialValue(property, undefined),
+      { emitEvent: false }
+    );
     this.form.controls[propertyName].updateValueAndValidity({
       emitEvent: false,
     });
diff --git a/packages/ui/feature-builder-right-sidebar/src/lib/step-type-sidebar/step-type-list/step-type-list.component.html b/packages/ui/feature-builder-right-sidebar/src/lib/step-type-sidebar/step-type-list/step-type-list.component.html
index d32b36eb98..96633393a9 100755
--- a/packages/ui/feature-builder-right-sidebar/src/lib/step-type-sidebar/step-type-list/step-type-list.component.html
+++ b/packages/ui/feature-builder-right-sidebar/src/lib/step-type-sidebar/step-type-list/step-type-list.component.html
@@ -9,20 +9,12 @@
 </div>
 
 
-<!-- 100vh - (height of tabs + height of sidebar title) - builder header height  -->
-<cdk-virtual-scroll-viewport *ngIf="typesList.length> 50; else nonVirtualList" maxBufferPx="400" itemSize="80"
-  class="ap-h-[calc(100vh-204px-76px)] ap-flex-grow  thin-scrollbars  ap-my-2">
-  <div class="ap-my-2 ap-mx-5" *cdkVirtualFor="let flowItemDetails of typesList">
-    <app-step-type-item [flowItemDetails]="flowItemDetails" (click)="typeSelected.emit({flowItemDetails})" (suggestionClicked)="typeSelected.emit({flowItemDetails,suggestion:$event})"  >
-    </app-step-type-item>
-  </div>
-</cdk-virtual-scroll-viewport>
 
-<ng-template #nonVirtualList>
+
+
   <div *ngIf="typesList.length>0" class="ap-h-[calc(100vh-204px-76px)] ap-overflow-auto  ap-flex-grow  thin-scrollbars  ap-my-2">
     <div *ngFor="let flowItemDetails of typesList" class="ap-my-2 ap-mx-5">
       <app-step-type-item [flowItemDetails]="flowItemDetails" (click)="typeSelected.emit({flowItemDetails})" (suggestionClicked)="typeSelected.emit({flowItemDetails,suggestion:$event})"  >
       </app-step-type-item>
     </div>
-  </div>
-</ng-template> 
\ No newline at end of file
+  </div>
\ No newline at end of file