diff --git a/src/app/adf-event-scripts/df-script-details/df-script-details.component.html b/src/app/adf-event-scripts/df-script-details/df-script-details.component.html
index a7ba0424..8d731f07 100644
--- a/src/app/adf-event-scripts/df-script-details/df-script-details.component.html
+++ b/src/app/adf-event-scripts/df-script-details/df-script-details.component.html
@@ -45,7 +45,9 @@
       class="half-width"
       subscriptSizing="dynamic">
       <mat-label>{{ 'scripts.scriptMethod' | transloco }}</mat-label>
-      <mat-select [(value)]="selectedRouteItem">
+      <mat-select
+        [(value)]="selectedRouteItem"
+        (selectionChange)="selectedRoute()">
         <mat-option *ngFor="let item of ungroupedRouteOptions" [value]="item">
           {{ item }}
         </mat-option>
@@ -61,7 +63,7 @@
       </mat-option>
     </mat-autocomplete> -->
     </mat-form-field>
-    <ng-container *ngIf="this.tableOptions">
+    <ng-container *ngIf="!!this.tableOptions">
       <mat-form-field
         appearance="outline"
         class="full-width"
diff --git a/src/app/adf-event-scripts/df-script-details/df-script-details.component.ts b/src/app/adf-event-scripts/df-script-details/df-script-details.component.ts
index a938a296..5bd6df3e 100644
--- a/src/app/adf-event-scripts/df-script-details/df-script-details.component.ts
+++ b/src/app/adf-event-scripts/df-script-details/df-script-details.component.ts
@@ -23,15 +23,12 @@ import { MatAutocompleteModule } from '@angular/material/autocomplete';
 import { MatInputModule } from '@angular/material/input';
 import { Observable, map, startWith } from 'rxjs';
 import { groupEvents } from 'src/app/shared/utilities/eventScripts';
-import {
-  BASE_SERVICE_TOKEN,
-  EVENTS_SERVICE_TOKEN,
-  EVENT_SCRIPT_SERVICE_TOKEN,
-} from 'src/app/shared/constants/tokens';
+import { EVENT_SCRIPT_SERVICE_TOKEN } from 'src/app/shared/constants/tokens';
 import { DfBaseCrudService } from 'src/app/shared/services/df-base-crud.service';
-import { Service, ServiceType } from 'src/app/shared/types/service';
+import { Service } from 'src/app/shared/types/service';
 import { CommonModule } from '@angular/common';
 import { DfThemeService } from 'src/app/shared/services/df-theme.service';
+import { camelToSnakeString } from 'src/app/shared/utilities/case';
 
 @UntilDestroy({ checkProperties: true })
 @Component({
@@ -103,7 +100,13 @@ export class DfScriptDetailsComponent implements OnInit {
       this.type = type;
       if (type === 'edit') {
         this.scriptDetails = data;
-        this.scriptForm.patchValue(data);
+        let editData = Object.keys(data).reduce(
+          (acc, cur) =>
+            (acc = { ...acc, [camelToSnakeString(cur)]: data[cur] }),
+          {}
+        );
+        editData = { ...editData, isActive: data.isActive };
+        this.scriptForm.patchValue(editData);
         this.scriptForm.controls['name'].disable();
         this.completeScriptName = data.name;
       } else {
@@ -190,7 +193,6 @@ export class DfScriptDetailsComponent implements OnInit {
   }
 
   selectedEventItemEvent() {
-    this.tableOptions = [];
     this.ungroupedRouteOptions = [
       ...this.ungroupedEventOptions[this.selectedEventItem].endpoints,
     ];
@@ -209,4 +211,14 @@ export class DfScriptDetailsComponent implements OnInit {
       this.selectTable
     );
   }
+
+  selectedRoute() {
+    this.completeScriptName = this.selectedRouteItem;
+    if (this.selectTable) {
+      this.completeScriptName = this.completeScriptName.replace(
+        '{table_name}',
+        this.selectTable
+      );
+    }
+  }
 }