diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html
index b157fd3aa4..dd798749da 100644
--- a/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html
+++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/parcel/parcel.component.html
@@ -69,19 +69,59 @@ <h4 [id]="parcel.uuid">Parcel #{{ parcelInd + 1 }}: Parcel and Owner Information
         <a (click)="openFile(parcel.certificateOfTitle)">{{ parcel.certificateOfTitle.fileName }}</a>
       </div>
     </div>
-    <div
-      class="full-width owner-information"
-      [ngClass]="{ 'crown-owner-information': parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN }"
-    >
-      <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Land Owner(s)</div>
-      <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Crown Contact(s)</div>
-      <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Organization</div>
-      <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
-        Ministry/Department
-      </div>
+    <ng-container *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
+      <h5>Government Parcel Contact</h5>
+      <ng-container *ngIf="parcel.owners[0]">
+        <div class="subheading2 grid-1">First Name</div>
+        <div class="grid-double">
+          {{ parcel.owners[0].firstName }}
+          <app-no-data *ngIf="!parcel.owners[0].firstName"></app-no-data>
+        </div>
+        <div class="subheading2 grid-1">
+          Last Name
+        </div>
+        <div class="grid-double">
+          {{ parcel.owners[0].lastName }}
+          <app-no-data *ngIf="!parcel.owners[0].lastName"></app-no-data>
+        </div>
+        <div class="subheading2 grid-1">
+          Ministry or Department
+        </div>
+        <div class="grid-double">
+          {{ parcel.owners[0].organizationName }}
+          <app-no-data *ngIf="!parcel.owners[0].organizationName"></app-no-data>
+        </div>
+        <div class="subheading2 grid-1">
+          Phone
+        </div>
+        <div class="grid-double">
+          {{ parcel.owners[0].phoneNumber }}
+          <app-no-data *ngIf="!parcel.owners[0].phoneNumber"></app-no-data>
+        </div>
+        <div class="subheading2 grid-1">
+          Email
+        </div>
+        <div class="grid-double">
+          {{ parcel.owners[0].email }}
+          <app-no-data *ngIf="!parcel.owners[0].email"></app-no-data>
+        </div>
+        <div class="subheading2 grid-1">
+          Crown Type
+        </div>
+        <div class="grid-double">
+          {{ parcel.owners[0].crownLandOwnerType === 'provincial' ? 'Provincial Crown' : '' }}
+          {{ parcel.owners[0].crownLandOwnerType === 'federal' ? 'Federal Crown' : '' }}
+          <app-no-data *ngIf="!parcel.owners[0].crownLandOwnerType"></app-no-data>
+        </div>
+      </ng-container>
+      <app-no-data *ngIf="!parcel.owners[0]"></app-no-data>
+    </ng-container>
+    <div class="full-width owner-information" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">
+      <div class="subheading2">Land Owner(s)</div>
+      <div class="subheading2">Organization</div>
       <div class="subheading2">Phone</div>
       <div class="subheading2">Email</div>
-      <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Corporate Summary</div>
+      <div class="subheading2">Corporate Summary</div>
       <ng-container *ngFor="let owner of parcel.owners">
         <div>{{ owner.displayName }}</div>
         <div>
@@ -90,7 +130,7 @@ <h4 [id]="parcel.uuid">Parcel #{{ parcelInd + 1 }}: Parcel and Owner Information
         </div>
         <div>{{ owner.phoneNumber }}</div>
         <div>{{ owner.email }}</div>
-        <div *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">
+        <div>
           <a *ngIf="owner.corporateSummary" (click)="openFile(owner.corporateSummary)">{{
             owner.corporateSummary.fileName
           }}</a>
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html
index e6dcfadabf..2236970f28 100644
--- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html
@@ -44,7 +44,6 @@
     <textarea
       class="soil-text-area"
       formControlName="soilTypeRemoved"
-      #fillTypeToPlaceText
       maxlength="4000"
       matInput
       placeholder="Type of soil approved to be removed*"
@@ -55,7 +54,6 @@
     <textarea
       class="soil-text-area"
       formControlName="fillTypeToPlace"
-      #fillTypeToPlaceText
       maxlength="4000"
       matInput
       placeholder="Type, origin and quality of fill approved to be placed*"
@@ -66,13 +64,13 @@
     <div class="soil-table">
       <div></div>
       <div>
-        <label for="volume">Soil to be Removed</label>
+        <label>Soil to be Removed</label>
       </div>
       <div>
-        <label for="volume">Fill to be placed</label>
+        <label>Fill to be placed</label>
       </div>
       <div class="label">
-        <label for="volumeToRemove">Volume*</label>
+        <label>Volume*</label>
       </div>
       <div>
         <mat-form-field appearance="outline" class="full-width">
@@ -101,7 +99,7 @@
         </mat-form-field>
       </div>
       <div class="label">
-        <label for="areaToRemove">Area*</label>
+        <label>Area*</label>
       </div>
       <div>
         <mat-form-field appearance="outline" class="full-width">
@@ -130,7 +128,7 @@
         </mat-form-field>
       </div>
       <div class="label">
-        <label for="maximumDepthToRemove">Maximum Depth*</label>
+        <label>Maximum Depth*</label>
       </div>
       <div>
         <mat-form-field appearance="outline" class="full-width">
@@ -159,7 +157,7 @@
         </mat-form-field>
       </div>
       <div class="label">
-        <label for="averageDepthToRemove">Average Depth*</label>
+        <label>Average Depth*</label>
       </div>
       <div>
         <mat-form-field appearance="outline" class="full-width">
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html
index 50bff205de..7f5e2a3cb7 100644
--- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html
@@ -86,7 +86,7 @@
         thousandSeparator=","
         separatorLimit="9999999999"
         formControlName="averageDepthToPlace"
-        placeholder="Volume*"
+        placeholder="Average Depth*"
       />
       <span matTextSuffix>m</span>
     </mat-form-field>
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html
index 34b18cef74..5109ab646a 100644
--- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html
@@ -31,7 +31,6 @@
     <textarea
       class="soil-text-area"
       formControlName="soilTypeRemoved"
-      #fillTypeToPlaceText
       maxlength="4000"
       matInput
       placeholder="Type of soil approved to be removed*"
@@ -62,7 +61,7 @@
         formControlName="areaToRemove"
         placeholder="Area*"
       />
-      <span matTextSuffix>ha</span>
+      <span matTextSuffix>m<sup>2</sup></span>
     </mat-form-field>
 
     <mat-form-field appearance="outline">
@@ -86,7 +85,7 @@
         thousandSeparator=","
         separatorLimit="9999999999"
         formControlName="averageDepthToRemove"
-        placeholder="Volume*"
+        placeholder="Average Depth*"
       />
       <span matTextSuffix>m</span>
     </mat-form-field>
diff --git a/alcs-frontend/src/app/features/home/assigned/assigned-table/assigned-table.component.ts b/alcs-frontend/src/app/features/home/assigned/assigned-table/assigned-table.component.ts
index b1982f7960..16528da22e 100644
--- a/alcs-frontend/src/app/features/home/assigned/assigned-table/assigned-table.component.ts
+++ b/alcs-frontend/src/app/features/home/assigned/assigned-table/assigned-table.component.ts
@@ -21,28 +21,11 @@ export interface AssignedToMeFile {
 })
 export class AssignedTableComponent {
   @Input() assignedFiles: AssignedToMeFile[] = [];
+  displayedColumns = ['highPriority', 'title', 'type', 'activeDays', 'stage'];
 
   constructor(private router: Router) {}
 
   async onSelectCard(card: CardDto) {
     await this.router.navigateByUrl(`/board/${card.boardCode}?card=${card.uuid}&type=${card.type}`);
   }
-
-  get displayedColumns(): string[] {
-    // Include all default columns
-    const columns = ['highPriority', 'title', 'type', 'activeDays', 'stage'];
-
-    // Check if any file has type 'NOTI'
-    const hasNoti = this.assignedFiles.some(file => file.type === 'NOTI');
-
-    // If 'NOTI' type exists, remove 'activeDays' column
-    if (hasNoti) {
-      const index = columns.indexOf('activeDays');
-      if (index !== -1) {
-        columns.splice(index, 1);
-      }
-    }
-
-    return columns;
-  }
 }
diff --git a/alcs-frontend/src/app/features/home/subtask/subtask-table/subtask-table.component.ts b/alcs-frontend/src/app/features/home/subtask/subtask-table/subtask-table.component.ts
index e815cdf08c..783aea7f8d 100644
--- a/alcs-frontend/src/app/features/home/subtask/subtask-table/subtask-table.component.ts
+++ b/alcs-frontend/src/app/features/home/subtask/subtask-table/subtask-table.component.ts
@@ -22,7 +22,6 @@ export class SubtaskTableComponent {
   @Input() subtasks: HomepageSubtaskDto[] = [];
   @Input() users: AssigneeDto[] = [];
 
-  displayedColumns = ['highPriority', 'title', 'type', 'activeDays', 'stage', 'assignee', 'action'];
 
   MODIFICATION_TYPE_LABEL = MODIFICATION_TYPE_LABEL;
   PLANNING_TYPE_LABEL = PLANNING_TYPE_LABEL;
@@ -39,6 +38,23 @@ export class SubtaskTableComponent {
     private cardSubtaskService: CardSubtaskService,
   ) {}
 
+  get displayedColumns(): string[] {
+    // Include all default columns
+    const columns = ['highPriority', 'title', 'type', 'activeDays', 'stage', 'assignee', 'action'];
+
+    // Check if any file has type 'NOTI'
+    const hasNoti = this.subtasks.some(task => task.parentType === 'notification');
+    // If 'NOTI' type exists, remove 'activeDays' column
+    if (hasNoti) {
+      const index = columns.indexOf('activeDays');
+      if (index !== -1) {
+        columns.splice(index, 1);
+      }
+    }
+
+    return columns;
+  }
+
   filterAssigneeList(term: string, item: AssigneeDto) {
     const termLower = term.toLocaleLowerCase();
     return (
diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html
index 4e75b7ca5c..0fcb8e5cdf 100644
--- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html
+++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html
@@ -68,20 +68,62 @@ <h4 [id]="parcel.uuid">Parcel #{{ parcelInd + 1 }}: Parcel and Owner Information
         <a (click)="onOpenFile(parcel.certificateOfTitle)">{{ parcel.certificateOfTitle.fileName }}</a>
       </div>
     </div>
-
+    <ng-container *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
+      <h5>Government Parcel Contact</h5>
+      <ng-container *ngIf="parcel.owners[0]">
+        <div class="subheading2 grid-1">First Name</div>
+        <div class="grid-double">
+          {{ parcel.owners[0].firstName }}
+          <app-no-data *ngIf="!parcel.owners[0].firstName"></app-no-data>
+        </div>
+        <div class="subheading2 grid-1">
+          Last Name
+        </div>
+        <div class="grid-double">
+          {{ parcel.owners[0].lastName }}
+          <app-no-data *ngIf="!parcel.owners[0].lastName"></app-no-data>
+        </div>
+        <div class="subheading2 grid-1">
+          Ministry or Department
+        </div>
+        <div class="grid-double">
+          {{ parcel.owners[0].organizationName }}
+          <app-no-data *ngIf="!parcel.owners[0].organizationName"></app-no-data>
+        </div>
+        <div class="subheading2 grid-1">
+          Phone
+        </div>
+        <div class="grid-double">
+          {{ parcel.owners[0].phoneNumber }}
+          <app-no-data *ngIf="!parcel.owners[0].phoneNumber"></app-no-data>
+        </div>
+        <div class="subheading2 grid-1">
+          Email
+        </div>
+        <div class="grid-double">
+          {{ parcel.owners[0].email }}
+          <app-no-data *ngIf="!parcel.owners[0].email"></app-no-data>
+        </div>
+        <div class="subheading2 grid-1">
+          Crown Type
+        </div>
+        <div class="grid-double">
+          {{ parcel.owners[0].crownLandOwnerType === 'provincial' ? 'Provincial Crown' : '' }}
+          {{ parcel.owners[0].crownLandOwnerType === 'federal' ? 'Federal Crown' : '' }}
+          <app-no-data *ngIf="!parcel.owners[0].crownLandOwnerType"></app-no-data>
+        </div>
+      </ng-container>
+      <app-no-data *ngIf="!parcel.owners[0]"></app-no-data>
+    </ng-container>
     <div
       class="full-width owner-information"
-      [ngClass]="{ 'crown-owner-information': parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN }"
+      *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN"
     >
-      <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Land Owner(s)</div>
-      <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Crown Contact</div>
-      <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Organization</div>
-      <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
-        Ministry/Department
-      </div>
+      <div class="subheading2">Land Owner(s)</div>
+      <div class="subheading2">Organization</div>
       <div class="subheading2">Phone</div>
       <div class="subheading2">Email</div>
-      <div *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN" class="subheading2">Corporate Summary</div>
+      <div class="subheading2">Corporate Summary</div>
       <ng-container *ngFor="let owner of parcel.owners">
         <div>{{ owner.displayName }}</div>
         <div>
@@ -90,7 +132,7 @@ <h4 [id]="parcel.uuid">Parcel #{{ parcelInd + 1 }}: Parcel and Owner Information
         </div>
         <div>{{ owner.phoneNumber }}</div>
         <div>{{ owner.email }}</div>
-        <div *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">
+        <div>
           <a *ngIf="owner.corporateSummary" (click)="onOpenFile(owner.corporateSummary)">{{
             owner.corporateSummary.fileName
           }}</a>
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html
index 745b8f2303..417b19c5c1 100644
--- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html
+++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html
@@ -43,7 +43,6 @@
     <textarea
       class="soil-text-area"
       formControlName="soilTypeRemoved"
-      #fillTypeToPlaceText
       maxlength="4000"
       matInput
       placeholder="Type of soil approved to be removed*"
@@ -54,7 +53,6 @@
     <textarea
       class="soil-text-area"
       formControlName="fillTypeToPlace"
-      #fillTypeToPlaceText
       maxlength="4000"
       matInput
       placeholder="Type, origin and quality of fill approved to be placed*"
@@ -64,13 +62,13 @@
   <div class="soil-table">
     <div></div>
     <div>
-      <label for="volume">Soil to be Removed</label>
+      <label>Soil to be Removed</label>
     </div>
     <div>
-      <label for="volume">Fill to be placed</label>
+      <label>Fill to be placed</label>
     </div>
     <div class="label">
-      <label for="volumeToRemove">Volume*</label>
+      <label>Volume*</label>
     </div>
     <div>
       <mat-form-field appearance="outline" class="full-width">
@@ -99,7 +97,7 @@
       </mat-form-field>
     </div>
     <div class="label">
-      <label for="areaToRemove">Area*</label>
+      <label>Area*</label>
     </div>
     <div>
       <mat-form-field appearance="outline" class="full-width">
@@ -124,11 +122,11 @@
           matInput
           formControlName="areaToPlace"
         />
-        <span matTextSuffix>ha</span>
+        <span matTextSuffix>m<sup>2</sup></span>
       </mat-form-field>
     </div>
     <div class="label">
-      <label for="maximumDepthToRemove">Maximum Depth*</label>
+      <label>Maximum Depth*</label>
     </div>
     <div>
       <mat-form-field appearance="outline" class="full-width">
@@ -157,7 +155,7 @@
       </mat-form-field>
     </div>
     <div class="label">
-      <label for="averageDepthToRemove">Average Depth*</label>
+      <label>Average Depth*</label>
     </div>
     <div>
       <mat-form-field appearance="outline" class="full-width">
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html
index 2df4251a17..06eb57d13f 100644
--- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html
+++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html
@@ -31,7 +31,6 @@
     <textarea
       class="soil-text-area"
       formControlName="fillTypeToPlace"
-      #fillTypeToPlaceText
       maxlength="4000"
       matInput
       placeholder="Type, origin and quality of fill approved to be placed*"
@@ -62,7 +61,7 @@
         formControlName="areaToPlace"
         placeholder="Area*"
       />
-      <span matTextSuffix>ha</span>
+      <span matTextSuffix>m<sup>2</sup></span>
     </mat-form-field>
 
     <mat-form-field appearance="outline">
@@ -86,7 +85,7 @@
         thousandSeparator=","
         separatorLimit="9999999999"
         formControlName="averageDepthToPlace"
-        placeholder="Volume*"
+        placeholder="Average Depth*"
       />
       <span matTextSuffix>m</span>
     </mat-form-field>
diff --git a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html
index a1f3b2c9dd..5109ab646a 100644
--- a/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html
+++ b/alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html
@@ -61,7 +61,7 @@
         formControlName="areaToRemove"
         placeholder="Area*"
       />
-      <span matTextSuffix>ha</span>
+      <span matTextSuffix>m<sup>2</sup></span>
     </mat-form-field>
 
     <mat-form-field appearance="outline">
@@ -85,7 +85,7 @@
         thousandSeparator=","
         separatorLimit="9999999999"
         formControlName="averageDepthToRemove"
-        placeholder="Volume*"
+        placeholder="Average Depth*"
       />
       <span matTextSuffix>m</span>
     </mat-form-field>
diff --git a/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.ts b/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.ts
index ab35568d02..1143ab82a7 100644
--- a/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.ts
+++ b/alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.ts
@@ -79,6 +79,7 @@ export class ApplicationSearchTableComponent {
     this.pageIndex = 0;
     this.sortDirection = sort.direction;
     this.sortField = sort.active;
+    this.onTableChange();
   }
 
   private mapApplications(applications: ApplicationSearchResultDto[]): SearchResult[] {
diff --git a/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.ts b/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.ts
index 8db8737130..8212c4f7a7 100644
--- a/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.ts
+++ b/alcs-frontend/src/app/features/search/non-application-search-table/non-application-search-table.component.ts
@@ -72,6 +72,7 @@ export class NonApplicationSearchTableComponent {
     this.pageIndex = 0;
     this.sortDirection = sort.direction;
     this.sortField = sort.active;
+    this.onTableChange();
   }
 
   onSelectRecord(record: SearchResult) {
diff --git a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts
index 9bafd06113..ed209995c2 100644
--- a/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts
+++ b/alcs-frontend/src/app/services/notice-of-intent/notice-of-intent.dto.ts
@@ -324,6 +324,7 @@ export interface SubmittedNoticeOfIntentOwnerDto {
   firstName: string;
   lastName: string;
   organizationName?: string;
+  crownLandOwnerType?: string;
   phoneNumber: string;
   email: string;
   type: BaseCodeDto;
diff --git a/bin/migrate-oats-data/applications/post_launch/application_components/__init__.py b/bin/migrate-oats-data/applications/post_launch/application_components/__init__.py
new file mode 100644
index 0000000000..00ea1101d8
--- /dev/null
+++ b/bin/migrate-oats-data/applications/post_launch/application_components/__init__.py
@@ -0,0 +1 @@
+from .boundary_amendments import *
diff --git a/bin/migrate-oats-data/applications/post_launch/application_components/boundary_amendments/__init__.py b/bin/migrate-oats-data/applications/post_launch/application_components/boundary_amendments/__init__.py
new file mode 100644
index 0000000000..fe21d2bfd9
--- /dev/null
+++ b/bin/migrate-oats-data/applications/post_launch/application_components/boundary_amendments/__init__.py
@@ -0,0 +1,8 @@
+from .application_boundary_amendments_insert import (
+    clean_boundary_amendments,
+    insert_application_boundary_amendments,
+)
+from .application_boundary_amendments_to_components import (
+    link_application_boundary_amendments,
+    clean_linked_boundary_amendments,
+)
diff --git a/bin/migrate-oats-data/applications/post_launch/application_components/boundary_amendments/application_boundary_amendments_insert.py b/bin/migrate-oats-data/applications/post_launch/application_components/boundary_amendments/application_boundary_amendments_insert.py
new file mode 100644
index 0000000000..1ac16e8334
--- /dev/null
+++ b/bin/migrate-oats-data/applications/post_launch/application_components/boundary_amendments/application_boundary_amendments_insert.py
@@ -0,0 +1,130 @@
+from common import (
+    setup_and_get_logger,
+    BATCH_UPLOAD_SIZE,
+    OATS_ETL_USER,
+)
+from db import inject_conn_pool
+from psycopg2.extras import RealDictCursor
+
+etl_name = "import_application_boundary_amendments"
+logger = setup_and_get_logger(etl_name)
+
+
+@inject_conn_pool
+def insert_application_boundary_amendments(conn=None, batch_size=BATCH_UPLOAD_SIZE):
+    logger.info(f"Start {etl_name}")
+    with conn.cursor(cursor_factory=RealDictCursor) as cursor:
+        with open(
+            "applications/post_launch/sql/application_components/boundary_amendments/application_boundary_amendments_count.sql",
+            "r",
+            encoding="utf-8",
+        ) as sql_file:
+            count_query = sql_file.read()
+            cursor.execute(count_query)
+            count_total = dict(cursor.fetchone())["count"]
+        logger.info(f"Total applications data to insert: {count_total}")
+
+        failed_inserts_count = 0
+        successful_inserts_count = 0
+        last_component_id = 0
+
+        with open(
+            "applications/post_launch/sql/application_components/boundary_amendments/application_boundary_amendments.sql",
+            "r",
+            encoding="utf-8",
+        ) as sql_file:
+            application_sql = sql_file.read()
+            while True:
+                cursor.execute(
+                    f"""{application_sql} 
+                      AND  oaac.alr_appl_component_id > {last_component_id} ORDER BY  oaac.alr_appl_component_id;"""
+                )
+
+                rows = cursor.fetchmany(batch_size)
+
+                if not rows:
+                    break
+                try:
+                    records_to_be_inserted_count = len(rows)
+
+                    _insert_records(conn, cursor, rows)
+
+                    successful_inserts_count = (
+                        successful_inserts_count + records_to_be_inserted_count
+                    )
+
+                    last_record = dict(rows[-1])
+                    last_component_id = last_record["alr_appl_component_id"]
+
+                    logger.debug(
+                        f"retrieved/updated items count: {records_to_be_inserted_count}; total successfully insert applications boundary amendments so far {successful_inserts_count}; last updated {last_component_id}"
+                    )
+                except Exception as err:
+                    logger.exception(err)
+                    conn.rollback()
+                    failed_inserts_count = count_total - successful_inserts_count
+                    last_component_id = last_component_id + 1
+
+    logger.info(
+        f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts_count}"
+    )
+
+
+def _insert_records(conn, cursor, rows):
+    number_of_rows_to_insert = len(rows)
+
+    if number_of_rows_to_insert > 0:
+        insert_query = _compile_insert_query(number_of_rows_to_insert)
+        rows_to_insert = _prepare_data_to_insert(rows)
+        cursor.execute(insert_query, rows_to_insert)
+        conn.commit()
+
+
+def _compile_insert_query(number_of_rows_to_insert):
+    amendments_to_insert = ",".join(["%s"] * number_of_rows_to_insert)
+    return f"""
+                        INSERT INTO alcs.application_boundary_amendment(
+                            file_number, 
+                            type,
+                            area,
+                            year,
+                            period,
+                            oats_component_id,
+                            audit_created_by
+                        )
+                        VALUES{amendments_to_insert}
+                        ON CONFLICT DO NOTHING;
+    """
+
+
+def _prepare_data_to_insert(rows):
+    row_without_last_element = []
+    for row in rows:
+        mapped_row = _map_data(row)
+        row_without_last_element.append(tuple(mapped_row.values()))
+
+    return row_without_last_element
+
+
+def _map_data(row):
+    return {
+        "file_number": row["file_number"],
+        "type": row["application_decision_component_type_code"],
+        "area": row["alr_area"],
+        "year": row["amendment_year"],
+        "period": row["amendment_period"],
+        "oats_component_id": row["alr_appl_component_id"],
+        "audit_created_by": OATS_ETL_USER,
+    }
+
+
+@inject_conn_pool
+def clean_boundary_amendments(conn=None):
+    logger.info("Start application boundary amendment cleaning")
+    with conn.cursor() as cursor:
+        cursor.execute(
+            f"DELETE FROM alcs.application_boundary_amendment aba WHERE aba.audit_created_by = '{OATS_ETL_USER}' AND aba.audit_updated_by IS NULL"
+        )
+        logger.info(f"Deleted items count = {cursor.rowcount}")
+    conn.commit()
+    logger.info("Done application boundary amendment cleaning")
diff --git a/bin/migrate-oats-data/applications/post_launch/application_components/boundary_amendments/application_boundary_amendments_to_components.py b/bin/migrate-oats-data/applications/post_launch/application_components/boundary_amendments/application_boundary_amendments_to_components.py
new file mode 100644
index 0000000000..7bdcc00046
--- /dev/null
+++ b/bin/migrate-oats-data/applications/post_launch/application_components/boundary_amendments/application_boundary_amendments_to_components.py
@@ -0,0 +1,120 @@
+from common import (
+    setup_and_get_logger,
+    BATCH_UPLOAD_SIZE,
+    OATS_ETL_USER,
+)
+from db import inject_conn_pool
+from psycopg2.extras import RealDictCursor
+
+etl_name = "link_application_boundary_amendments_to_components"
+logger = setup_and_get_logger(etl_name)
+
+
+@inject_conn_pool
+def link_application_boundary_amendments(conn=None, batch_size=BATCH_UPLOAD_SIZE):
+    logger.info(f"Start {etl_name}")
+    with conn.cursor(cursor_factory=RealDictCursor) as cursor:
+        with open(
+            "applications/post_launch/sql/application_components/boundary_amendments/link_application_boundary_amendments_to_components_count.sql",
+            "r",
+            encoding="utf-8",
+        ) as sql_file:
+            count_query = sql_file.read()
+            cursor.execute(count_query)
+            count_total = dict(cursor.fetchone())["count"]
+        logger.info(f"Total applications data to insert: {count_total}")
+
+        failed_inserts_count = 0
+        successful_inserts_count = 0
+        last_component_id = 0
+
+        with open(
+            "applications/post_launch/sql/application_components/boundary_amendments/link_application_boundary_amendments_to_components.sql",
+            "r",
+            encoding="utf-8",
+        ) as sql_file:
+            application_sql = sql_file.read()
+            while True:
+                cursor.execute(
+                    f"""{application_sql} 
+                      WHERE  aba.oats_component_id > {last_component_id} ORDER BY  aba.oats_component_id;"""
+                )
+
+                rows = cursor.fetchmany(batch_size)
+
+                if not rows:
+                    break
+                try:
+                    records_to_be_inserted_count = len(rows)
+
+                    _insert_records(conn, cursor, rows)
+
+                    successful_inserts_count = (
+                        successful_inserts_count + records_to_be_inserted_count
+                    )
+
+                    last_record = dict(rows[-1])
+                    last_component_id = last_record["oats_component_id"]
+
+                    logger.debug(
+                        f"retrieved/updated items count: {records_to_be_inserted_count}; total successfully insert applications boundary amendments so far {successful_inserts_count}; last updated {last_component_id}"
+                    )
+                except Exception as err:
+                    logger.exception(err)
+                    conn.rollback()
+                    failed_inserts_count = count_total - successful_inserts_count
+                    last_component_id = last_component_id + 1
+
+    logger.info(
+        f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts_count}"
+    )
+
+
+def _insert_records(conn, cursor, rows):
+    number_of_rows_to_insert = len(rows)
+
+    if number_of_rows_to_insert > 0:
+        insert_query = _compile_insert_query(number_of_rows_to_insert)
+        rows_to_insert = _prepare_data_to_insert(rows)
+        cursor.execute(insert_query, rows_to_insert)
+        conn.commit()
+
+
+def _compile_insert_query(number_of_rows_to_insert):
+    amendments_to_insert = ",".join(["%s"] * number_of_rows_to_insert)
+    return f"""
+                        INSERT INTO alcs.application_boundary_amendments_to_components(
+                            application_boundary_amendment_uuid, 
+                            application_decision_component_uuid
+                        )
+                        VALUES{amendments_to_insert}
+                        ON CONFLICT DO NOTHING;
+    """
+
+
+def _prepare_data_to_insert(rows):
+    row_without_last_element = []
+    for row in rows:
+        mapped_row = _map_data(row)
+        row_without_last_element.append(tuple(mapped_row.values()))
+
+    return row_without_last_element
+
+
+def _map_data(row):
+    return {
+        "application_boundary_amendment_uuid": row["boundary_uuid"],
+        "application_decision_component_uuid": row["component_uuid"],
+    }
+
+
+@inject_conn_pool
+def clean_linked_boundary_amendments(conn=None):
+    logger.info("Start application boundary amendment link cleaning")
+    with conn.cursor() as cursor:
+        cursor.execute(
+            f"DELETE FROM alcs.application_boundary_amendments_to_components aba"
+        )
+        logger.info(f"Deleted items count = {cursor.rowcount}")
+    conn.commit()
+    logger.info("Done application boundary amendment link cleaning")
diff --git a/bin/migrate-oats-data/applications/post_launch/clean.py b/bin/migrate-oats-data/applications/post_launch/clean.py
index 1227995682..83a41c4113 100644
--- a/bin/migrate-oats-data/applications/post_launch/clean.py
+++ b/bin/migrate-oats-data/applications/post_launch/clean.py
@@ -1,2 +1,9 @@
+from .application_components.boundary_amendments import (
+    clean_boundary_amendments,
+    clean_linked_boundary_amendments,
+)
+
+
 def clean_alcs_applications():
-    return
+    clean_linked_boundary_amendments()
+    clean_boundary_amendments()
diff --git a/bin/migrate-oats-data/applications/post_launch/migrate_application.py b/bin/migrate-oats-data/applications/post_launch/migrate_application.py
index ac8e925115..7a2dbbc2dd 100644
--- a/bin/migrate-oats-data/applications/post_launch/migrate_application.py
+++ b/bin/migrate-oats-data/applications/post_launch/migrate_application.py
@@ -1,3 +1,9 @@
+from .application_components.boundary_amendments import (
+    insert_application_boundary_amendments,
+    link_application_boundary_amendments,
+)
+
+
 def process_application_etl(batch_size):
-    # nothing
-    return
+    insert_application_boundary_amendments(batch_size)
+    link_application_boundary_amendments(batch_size)
diff --git a/bin/migrate-oats-data/applications/post_launch/sql/application_components/boundary_amendments/application_boundary_amendments.sql b/bin/migrate-oats-data/applications/post_launch/sql/application_components/boundary_amendments/application_boundary_amendments.sql
new file mode 100644
index 0000000000..2b611be0b2
--- /dev/null
+++ b/bin/migrate-oats-data/applications/post_launch/sql/application_components/boundary_amendments/application_boundary_amendments.sql
@@ -0,0 +1,14 @@
+SELECT
+    a.file_number,
+    adc.alr_area,
+    adc.application_decision_component_type_code,
+    oaac.amendment_year,
+    oaac.amendment_period,
+    oaac.alr_appl_component_id
+FROM
+    oats.oats_alr_appl_components oaac
+    JOIN alcs.application_decision_component adc ON oaac.alr_appl_component_id = adc.oats_alr_appl_component_id
+    JOIN alcs.application_decision ad ON adc.application_decision_uuid = ad."uuid"
+    JOIN alcs.application a ON ad.application_uuid = a."uuid"
+WHERE
+    oaac.amendment_year IS NOT NULL
\ No newline at end of file
diff --git a/bin/migrate-oats-data/applications/post_launch/sql/application_components/boundary_amendments/application_boundary_amendments_count.sql b/bin/migrate-oats-data/applications/post_launch/sql/application_components/boundary_amendments/application_boundary_amendments_count.sql
new file mode 100644
index 0000000000..765b810416
--- /dev/null
+++ b/bin/migrate-oats-data/applications/post_launch/sql/application_components/boundary_amendments/application_boundary_amendments_count.sql
@@ -0,0 +1,9 @@
+SELECT
+    count(*)
+FROM
+    oats.oats_alr_appl_components oaac
+    JOIN alcs.application_decision_component adc ON oaac.alr_appl_component_id = adc.oats_alr_appl_component_id
+    JOIN alcs.application_decision ad ON adc.application_decision_uuid = ad."uuid"
+    JOIN alcs.application a ON ad.application_uuid = a."uuid"
+WHERE
+    oaac.amendment_year IS NOT NULL;
\ No newline at end of file
diff --git a/bin/migrate-oats-data/applications/post_launch/sql/application_components/boundary_amendments/link_application_boundary_amendments_to_components.sql b/bin/migrate-oats-data/applications/post_launch/sql/application_components/boundary_amendments/link_application_boundary_amendments_to_components.sql
new file mode 100644
index 0000000000..13ee7b7be5
--- /dev/null
+++ b/bin/migrate-oats-data/applications/post_launch/sql/application_components/boundary_amendments/link_application_boundary_amendments_to_components.sql
@@ -0,0 +1,7 @@
+SELECT
+    aba."uuid" AS boundary_uuid,
+    adc."uuid" AS component_uuid,
+    aba.oats_component_id
+FROM
+    alcs.application_boundary_amendment aba
+    JOIN alcs.application_decision_component adc ON aba.oats_component_id = adc.oats_alr_appl_component_id
\ No newline at end of file
diff --git a/bin/migrate-oats-data/applications/post_launch/sql/application_components/boundary_amendments/link_application_boundary_amendments_to_components_count.sql b/bin/migrate-oats-data/applications/post_launch/sql/application_components/boundary_amendments/link_application_boundary_amendments_to_components_count.sql
new file mode 100644
index 0000000000..1f3b8dda02
--- /dev/null
+++ b/bin/migrate-oats-data/applications/post_launch/sql/application_components/boundary_amendments/link_application_boundary_amendments_to_components_count.sql
@@ -0,0 +1,5 @@
+SELECT
+    COUNT(*)
+FROM
+    alcs.application_boundary_amendment aba
+    JOIN alcs.application_decision_component adc ON aba.oats_component_id = adc.oats_alr_appl_component_id;
\ No newline at end of file
diff --git a/bin/migrate-oats-data/common/constants.py b/bin/migrate-oats-data/common/constants.py
index b49556d29e..a6d58ea21a 100644
--- a/bin/migrate-oats-data/common/constants.py
+++ b/bin/migrate-oats-data/common/constants.py
@@ -1,3 +1,3 @@
 OATS_ETL_USER = "oats_etl"
 BATCH_UPLOAD_SIZE = 1000
-NO_DATA_IN_OATS = 'No data found in OATS'
\ No newline at end of file
+NO_DATA_IN_OATS = "No data found in OATS"
diff --git a/bin/migrate-oats-data/menu/command_parser/__init__.py b/bin/migrate-oats-data/menu/command_parser/__init__.py
index 8cb4a6d274..38126e29f6 100644
--- a/bin/migrate-oats-data/menu/command_parser/__init__.py
+++ b/bin/migrate-oats-data/menu/command_parser/__init__.py
@@ -2,3 +2,4 @@
 from .notice_of_intent_command_parser import *
 from .document_command_parser import *
 from .user_command_parser import *
+from .srw_command_parser import *
diff --git a/bin/migrate-oats-data/menu/command_parser/srw_command_parser.py b/bin/migrate-oats-data/menu/command_parser/srw_command_parser.py
new file mode 100644
index 0000000000..6dc804c581
--- /dev/null
+++ b/bin/migrate-oats-data/menu/command_parser/srw_command_parser.py
@@ -0,0 +1,19 @@
+def srw_import_command_parser(import_batch_size, subparsers):
+    srw_import_command = subparsers.add_parser(
+        "srw-import",
+        help=f"Import SRW with specified batch size: (default: {import_batch_size})",
+    )
+    srw_import_command.add_argument(
+        "--batch-size",
+        type=int,
+        default=import_batch_size,
+        metavar="",
+        help=f"batch size (default: {import_batch_size})",
+    )
+
+
+def srw_clean_command_parser(subparsers):
+    subparsers.add_parser(
+        "srw-clean",
+        help="Clean SRW imported data:",
+    )
diff --git a/bin/migrate-oats-data/menu/menu.py b/bin/migrate-oats-data/menu/menu.py
index 02666d292f..9d0a14964e 100644
--- a/bin/migrate-oats-data/menu/menu.py
+++ b/bin/migrate-oats-data/menu/menu.py
@@ -18,6 +18,10 @@
     user_clean_command_parser,
 )
 from common import BATCH_UPLOAD_SIZE
+from .command_parser.srw_command_parser import (
+    srw_import_command_parser,
+    srw_clean_command_parser,
+)
 
 import_batch_size = BATCH_UPLOAD_SIZE
 
@@ -52,6 +56,8 @@ def setup_menu_args_parser(import_batch_size):
     _import_command_parser(subparsers)
     user_import_command_parser(import_batch_size, subparsers)
     user_clean_command_parser(subparsers)
+    srw_import_command_parser(import_batch_size, subparsers)
+    srw_clean_command_parser(subparsers)
     subparsers.add_parser("clean", help="Clean all imported data")
 
     subparsers.add_parser("obfuscate", help="Obfuscate PROD data")
diff --git a/bin/migrate-oats-data/menu/post_launch_commands/__init__.py b/bin/migrate-oats-data/menu/post_launch_commands/__init__.py
index 3f55f3c750..30ca959d00 100644
--- a/bin/migrate-oats-data/menu/post_launch_commands/__init__.py
+++ b/bin/migrate-oats-data/menu/post_launch_commands/__init__.py
@@ -2,3 +2,4 @@
 from .clean_all import clean_all
 from .applications import *
 from .notice_of_intents import *
+from .srws import *
diff --git a/bin/migrate-oats-data/menu/post_launch_commands/clean_all.py b/bin/migrate-oats-data/menu/post_launch_commands/clean_all.py
index 93a43bb76b..4e1e71f0ee 100644
--- a/bin/migrate-oats-data/menu/post_launch_commands/clean_all.py
+++ b/bin/migrate-oats-data/menu/post_launch_commands/clean_all.py
@@ -2,12 +2,14 @@
     clean_alcs_applications,
 )
 from noi.post_launch import clean_notice_of_intent
+from srw.post_launch import clean_srw
 
 
 def clean_all(console, args):
     with console.status("[bold green]Cleaning previous ETL...\n") as status:
         console.log("Cleaning data:")
-        clean_alcs_applications(),
+        clean_alcs_applications()
         clean_notice_of_intent()
+        clean_srw()
 
         console.log("Done")
diff --git a/bin/migrate-oats-data/menu/post_launch_commands/import_all.py b/bin/migrate-oats-data/menu/post_launch_commands/import_all.py
index b38fb2c269..8e50944139 100644
--- a/bin/migrate-oats-data/menu/post_launch_commands/import_all.py
+++ b/bin/migrate-oats-data/menu/post_launch_commands/import_all.py
@@ -2,6 +2,7 @@
 from noi.post_launch import (
     process_notice_of_intent,
 )
+from srw.post_launch.srw_migration import process_srw
 
 
 def import_all(console, args):
@@ -18,4 +19,7 @@ def import_all(console, args):
         console.log("Processing notice of intents")
         process_notice_of_intent(batch_size=import_batch_size)
 
+        console.log("Processing SRW")
+        process_srw(batch_size=import_batch_size)
+
         console.log("Done")
diff --git a/bin/migrate-oats-data/menu/post_launch_commands/srws.py b/bin/migrate-oats-data/menu/post_launch_commands/srws.py
new file mode 100644
index 0000000000..e0caa6e0d0
--- /dev/null
+++ b/bin/migrate-oats-data/menu/post_launch_commands/srws.py
@@ -0,0 +1,26 @@
+from srw.post_launch import (
+    process_srw,
+    clean_srw,
+)
+from common import setup_and_get_logger
+
+logger = setup_and_get_logger("srw_import_post_launch")
+
+
+def srw_import(console, args):
+    logger.debug("Beginning OATS -> ALCS SRW import process")
+    with console.status(
+        "[bold green]SRW import (notification table update in ALCS)...\n"
+    ) as status:
+        if args.batch_size:
+            import_batch_size = args.batch_size
+
+        logger.debug(f"Processing SRW import in batch size = {import_batch_size}")
+
+        process_srw(batch_size=import_batch_size)
+
+
+def srw_clean(console):
+    logger.debug("Beginning OATS -> ALCS SRW import clean process")
+    with console.status("[bold green]SRW clean import...\n") as status:
+        clean_srw()
diff --git a/bin/migrate-oats-data/migrate.py b/bin/migrate-oats-data/migrate.py
index 71b8ae89a4..5157e3f5e9 100644
--- a/bin/migrate-oats-data/migrate.py
+++ b/bin/migrate-oats-data/migrate.py
@@ -12,6 +12,8 @@
     application_clean,
     notice_of_intent_import,
     notice_of_intent_clean,
+    srw_import,
+    srw_clean,
 )
 from db import connection_pool
 from common import BATCH_UPLOAD_SIZE, setup_and_get_logger
@@ -41,6 +43,10 @@
                 application_import(console, args)
             case "application-clean":
                 application_clean(console)
+            case "srw-import":
+                srw_import(console, args)
+            case "srw-clean":
+                srw_clean(console)
 
     finally:
         if connection_pool:
diff --git a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert.sql b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert.sql
index 33ed6f9842..08a65f1a93 100644
--- a/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert.sql
+++ b/bin/migrate-oats-data/noi/sql/notice_of_intent_submission/parcels/notice_of_intent_parcels_insert.sql
@@ -1,27 +1,22 @@
 WITH parcels_to_insert AS (
-    SELECT nois.uuid,
+    SELECT nos.uuid,
         osp.subject_property_id
-    FROM alcs.notice_of_intent_submission nois
-        JOIN oats.oats_subject_properties osp ON osp.alr_application_id = nois.file_number::bigint
-    WHERE osp.alr_application_land_ind = 'Y' -- ensure that only parcels related to application are selected
+    FROM alcs.notification_submission nos
+        JOIN oats.oats_subject_properties osp ON osp.alr_application_id = nos.file_number::bigint
+    WHERE osp.alr_application_land_ind = 'Y'
+        AND nos.type_code = 'SRW'
 ),
 grouped_oats_property_interests_ids AS (
-    SELECT MIN(property_owner_type_code) AS property_owner_type_code,
-        -- min will not affect anything since all property_owner_type_code are the same in scope of subject_property
-        subject_property_id
+    SELECT subject_property_id
     FROM oats.oats_property_interests opi
     GROUP BY opi.subject_property_id
 )
-SELECT uuid AS notice_of_intent_submission_uuid,
-    osp.alr_area,
+SELECT uuid AS notification_submission_uuid,
     op.civic_address,
-    osp.farm_land_ind,
     op.legal_description,
     op.area_size,
     op.pid,
     op.pin,
-    osp.purchase_date,
-    gopi.property_owner_type_code,
     osp.subject_property_id,
     op.property_id
 FROM parcels_to_insert pti
diff --git a/bin/migrate-oats-data/srw/__init__.py b/bin/migrate-oats-data/srw/__init__.py
new file mode 100644
index 0000000000..e2ce0f6054
--- /dev/null
+++ b/bin/migrate-oats-data/srw/__init__.py
@@ -0,0 +1,2 @@
+from .srw_base import init_srw_base, clean_initial_srw
+from .srw_base_update import update_srw_base_fields
diff --git a/bin/migrate-oats-data/srw/applicant/__init__.py b/bin/migrate-oats-data/srw/applicant/__init__.py
new file mode 100644
index 0000000000..92a2484b1a
--- /dev/null
+++ b/bin/migrate-oats-data/srw/applicant/__init__.py
@@ -0,0 +1 @@
+from .srw_process_applicant import update_srw_base_applicant
diff --git a/bin/migrate-oats-data/srw/applicant/srw_process_applicant.py b/bin/migrate-oats-data/srw/applicant/srw_process_applicant.py
new file mode 100644
index 0000000000..c9fe262731
--- /dev/null
+++ b/bin/migrate-oats-data/srw/applicant/srw_process_applicant.py
@@ -0,0 +1,142 @@
+from common import (
+    BATCH_UPLOAD_SIZE,
+    setup_and_get_logger,
+)
+from db import inject_conn_pool
+from psycopg2.extras import RealDictCursor, execute_batch
+
+etl_name = "update_srw_base_applicant"
+logger = setup_and_get_logger(etl_name)
+
+
+@inject_conn_pool
+def update_srw_base_applicant(conn=None, batch_size=BATCH_UPLOAD_SIZE):
+    """
+    This function is responsible for populating applicant in alcs.notification in ALCS.
+
+    Args:
+    conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator.
+    batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE.
+    """
+
+    logger.info("Start update srw base fields")
+    with conn.cursor(cursor_factory=RealDictCursor) as cursor:
+        with open(
+            "srw/sql/applicant/srw_applicant_count.sql",
+            "r",
+            encoding="utf-8",
+        ) as sql_file:
+            count_query = sql_file.read()
+            cursor.execute(count_query)
+            count_total = dict(cursor.fetchone())["count"]
+        logger.info(f"Total SRW data to update: {count_total}")
+
+        failed_inserts = 0
+        successful_updates_count = 0
+        last_processed_id = 0
+
+        with open(
+            "srw/sql/applicant/srw_applicant.sql",
+            "r",
+            encoding="utf-8",
+        ) as sql_file:
+            query = sql_file.read()
+            while True:
+                cursor.execute(
+                    f"""
+                        {query} 
+                        AND oats_alr_application_party_id > {last_processed_id}
+                        ORDER BY oats_alr_application_party_id;
+                    """
+                )
+
+                rows = cursor.fetchmany(batch_size)
+
+                if not rows:
+                    break
+                try:
+                    updated_data = _update_applicant(conn, batch_size, cursor, rows)
+
+                    successful_updates_count = successful_updates_count + len(
+                        updated_data
+                    )
+                    last_processed_id = dict(updated_data[-1])[
+                        "oats_alr_application_party_id"
+                    ]
+
+                    logger.debug(
+                        f"Retrieved/updated items count: {len(updated_data)}; total successfully updated SRW so far {successful_updates_count}; last updated id: {last_processed_id}"
+                    )
+                except Exception as err:
+                    # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost
+                    logger.exception(err)
+                    conn.rollback()
+                    failed_inserts = count_total - successful_updates_count
+                    last_processed_id = last_processed_id + 1
+
+    logger.info(
+        f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts}"
+    )
+
+
+def _update_applicant(conn, batch_size, cursor, rows):
+    parsed_data_list = _prepare_oats_srw_data(rows)
+
+    execute_batch(
+        cursor,
+        _update_notification_applicant_query,
+        parsed_data_list,
+        page_size=batch_size,
+    )
+
+    execute_batch(
+        cursor,
+        _update_submission_applicant_query,
+        parsed_data_list,
+        page_size=batch_size,
+    )
+
+    conn.commit()
+    return parsed_data_list
+
+
+_update_notification_applicant_query = """
+                    UPDATE alcs.notification 
+                    SET applicant = %(applicant)s
+                    WHERE alcs.notification.file_number = %(file_number)s;
+"""
+
+_update_submission_applicant_query = """
+                    UPDATE alcs.notification_submission 
+                    SET applicant = %(applicant)s
+                    WHERE alcs.notification_submission.uuid = %(notification_submission_uuid)s;
+"""
+
+
+def _prepare_oats_srw_data(row_data_list):
+    mapped_data_list = []
+    for row in row_data_list:
+        applicant = _get_applicant(row)
+        if applicant:
+            mapped_data_list.append(
+                {
+                    "notification_submission_uuid": row["notification_submission_uuid"],
+                    "file_number": row["file_number"],
+                    "applicant": applicant,
+                    "oats_alr_application_party_id": row[
+                        "oats_alr_application_party_id"
+                    ],
+                }
+            )
+
+    return mapped_data_list
+
+
+def _get_applicant(data):
+    applicant = data["organization_name"]
+    if not applicant:
+        applicant = data["last_name"]
+
+    if applicant and data["applicant_suffix"]:
+        applicant = f"{applicant} {data['applicant_suffix']}"
+    return applicant
diff --git a/bin/migrate-oats-data/srw/post_launch/__init__.py b/bin/migrate-oats-data/srw/post_launch/__init__.py
new file mode 100644
index 0000000000..bd729bd5e0
--- /dev/null
+++ b/bin/migrate-oats-data/srw/post_launch/__init__.py
@@ -0,0 +1 @@
+from .srw_migration import *
diff --git a/bin/migrate-oats-data/srw/post_launch/srw_migration.py b/bin/migrate-oats-data/srw/post_launch/srw_migration.py
new file mode 100644
index 0000000000..90c054fab0
--- /dev/null
+++ b/bin/migrate-oats-data/srw/post_launch/srw_migration.py
@@ -0,0 +1,35 @@
+from ..srw_base import init_srw_base, clean_initial_srw
+from ..srw_base_update import update_srw_base_fields
+from ..submission.srw_submission_init import init_srw_submissions, clean_srw_submissions
+from ..submission.srw_proposal_fields import process_alcs_srw_proposal_fields
+from ..submission.parcel.srw_parcel_init import init_srw_parcels, clean_parcels
+from ..submission.transferee.srw_init_transferee import (
+    init_srw_parcel_transferee,
+    clean_transferees,
+)
+from ..applicant.srw_process_applicant import update_srw_base_applicant
+
+
+def process_srw(batch_size):
+    init_srw(batch_size)
+
+
+def init_srw(batch_size):
+    init_srw_base(batch_size)
+    update_srw_base_fields(batch_size)
+    _process_srw_submission(batch_size)
+    update_srw_base_applicant(batch_size)
+
+
+def _process_srw_submission(batch_size):
+    init_srw_submissions(batch_size)
+    process_alcs_srw_proposal_fields(batch_size)
+    init_srw_parcels(batch_size)
+    init_srw_parcel_transferee(batch_size)
+
+
+def clean_srw():
+    clean_transferees()
+    clean_parcels()
+    clean_srw_submissions()
+    clean_initial_srw()
diff --git a/bin/migrate-oats-data/srw/sql/applicant/srw_applicant.sql b/bin/migrate-oats-data/srw/sql/applicant/srw_applicant.sql
new file mode 100644
index 0000000000..3667be8d62
--- /dev/null
+++ b/bin/migrate-oats-data/srw/sql/applicant/srw_applicant.sql
@@ -0,0 +1,24 @@
+WITH ranked_transferees AS (
+    SELECT *,
+        ROW_NUMBER() OVER (
+            PARTITION BY notification_submission_uuid
+            ORDER BY type_code DESC,
+                audit_created_at
+        ) AS rn
+    FROM alcs.notification_transferee
+)
+SELECT *,
+    (
+        CASE
+            WHEN (
+                SELECT count(*)
+                FROM alcs.notification_transferee
+                WHERE notification_submission_uuid = ranked_transferees.notification_submission_uuid
+            ) > 1 THEN ' et al.'
+            ELSE ''
+        END
+    ) AS applicant_suffix,
+    ns.file_number
+FROM ranked_transferees
+    JOIN alcs.notification_submission ns ON ns."uuid" = notification_submission_uuid AND ns.type_code='SRW'
+WHERE rn = 1
\ No newline at end of file
diff --git a/bin/migrate-oats-data/srw/sql/applicant/srw_applicant_count.sql b/bin/migrate-oats-data/srw/sql/applicant/srw_applicant_count.sql
new file mode 100644
index 0000000000..4d38a40354
--- /dev/null
+++ b/bin/migrate-oats-data/srw/sql/applicant/srw_applicant_count.sql
@@ -0,0 +1,14 @@
+WITH ranked_transferees AS (
+    SELECT *,
+        ROW_NUMBER() OVER (
+            PARTITION BY notification_submission_uuid
+            ORDER BY type_code DESC,
+                audit_created_at
+        ) AS rn
+    FROM alcs.notification_transferee
+)
+SELECT count(*)
+FROM ranked_transferees
+    JOIN alcs.notification_submission ns ON ns."uuid" = notification_submission_uuid
+    AND ns.type_code = 'SRW'
+WHERE rn = 1
\ No newline at end of file
diff --git a/bin/migrate-oats-data/srw/sql/srw_base_insert.sql b/bin/migrate-oats-data/srw/sql/srw_base_insert.sql
new file mode 100644
index 0000000000..d28d167953
--- /dev/null
+++ b/bin/migrate-oats-data/srw/sql/srw_base_insert.sql
@@ -0,0 +1,116 @@
+-- Step 1: get local gov application name & match to uuid
+WITH oats_gov AS (
+    SELECT oaap.alr_application_id AS application_id,
+        oo.organization_name AS oats_gov_name
+    FROM oats.oats_alr_application_parties oaap
+        JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id
+        JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id
+    WHERE oo.organization_type_cd IN ('MUNI', 'FN', 'RD', 'RM')
+),
+alcs_gov AS (
+    SELECT oats_gov.application_id AS application_id,
+        alg.uuid AS gov_uuid
+    FROM oats_gov
+        JOIN alcs.local_government alg on (
+            CASE
+                WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Gabriola Island' THEN 'Islands Trust Gabriola Island (Historical)'
+                WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Galiano Island' THEN 'Islands Trust Galiano Island (Historical)'
+                WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Gambier Island' THEN 'Islands Trust Gambier Island (Historical)'
+                WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Hornby Island' THEN 'Islands Trust Hornby Island (Historical)'
+                WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Lasqueti Island' THEN 'Islands Trust Lasqueti Island (Historical)'
+                WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Mayne Island' THEN 'Islands Trust Mayne Island (Historical)'
+                WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Pender Island' THEN 'Islands Trust Pender Island (Historical)'
+                WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Quadra Island' THEN 'Islands Trust Quadra Island (Historical)'
+                WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Salt Spring Island' THEN 'Islands Trust Salt Spring Island (Historical)'
+                WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Saturna Island' THEN 'Islands Trust Saturna Island (Historical)'
+                WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Sidney Island' THEN 'Islands Trust Sidney Island (Historical)'
+                WHEN oats_gov.oats_gov_name LIKE 'Islands Trust- Comox Strathcona' THEN 'Islands Trust Comox Strathcona (Historical)'
+                WHEN oats_gov.oats_gov_name LIKE 'Comox-Strathcona (Historical)' THEN 'Comox-Strathcona Regional District (Historical)'
+                WHEN oats_gov.oats_gov_name LIKE 'Islands Trust- Nanaimo' THEN 'Islands Trust Nanaimo (Historical)'
+                WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Capital' THEN 'Islands Trust Capital (Historical)'
+                WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Powell River' THEN 'Islands Trust Powell River (Historical)'
+                WHEN oats_gov.oats_gov_name LIKE 'Islands Trust-Sunshine Coast' THEN 'Islands Trust Sunshine Coast (Historical)'
+                WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Bowen Island' THEN 'Bowen Island (Island Municipality)'
+                WHEN oats_gov.oats_gov_name LIKE 'Islands Trust Denman Island' THEN 'Islands Trust Denman Island (Historical)'
+                WHEN oats_gov.oats_gov_name LIKE 'Islands Trust - Cowichan Valley' THEN 'Islands Trust Cowichan Valley (Historical)'
+                WHEN oats_gov.oats_gov_name LIKE 'Northern Rockies' THEN 'Northern Rockies (Historical)'
+                WHEN oats_gov.oats_gov_name LIKE 'Sliammon%' THEN 'Tla''amin Nation'
+                WHEN oats_gov.oats_gov_name LIKE 'Thompson Nicola%' THEN 'Thompson Nicola Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'Cariboo%' THEN 'Cariboo Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'Fraser Valley%' THEN 'Fraser Valley Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'Columbia Shuswap%' THEN 'Columbia Shuswap Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'Central Okanagan%' THEN 'Central Okanagan Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'Squamish Lillooet%' THEN 'Squamish Lillooet Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'Alberni-Clayoquot%' THEN 'Alberni-Clayoquot Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'qathet%' THEN 'qathet Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'Peace River%' THEN 'Peace River Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'Okanagan Similkameen%' THEN 'Okanagan Similkameen Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'East Kootenay%' THEN 'East Kootenay Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'Bulkley-Nechako%' THEN 'Bulkley-Nechako Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'Sunshine Coast%' THEN 'Sunshine Coast Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'Nanaimo%' THEN 'Nanaimo Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'Kitimat Stikine%' THEN 'Kitimat Stikine Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'North Okanagan%' THEN 'North Okanagan Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'Fraser Fort George%' THEN 'Fraser Fort George Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'Cowichan Valley%' THEN 'Cowichan Valley Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'Kootenay Boundary%' THEN 'Kootenay Boundary Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'Comox Valley%' THEN 'Comox Valley Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'Central Kootenay%' THEN 'Central Kootenay Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'Capital%' THEN 'Capital Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'Metro Vancouver%' THEN 'Metro Vancouver Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'Central Coast%' THEN 'Central Coast Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'North Coast%' THEN 'North Coast Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'Strathcona%' THEN 'Strathcona Regional District'
+                WHEN oats_gov.oats_gov_name LIKE 'Mount Waddington%' THEN 'Mount Waddington Regional District'
+                ELSE oats_gov.oats_gov_name
+            END
+        ) = alg."name"
+),
+-- Step 2: Perform a lookup to retrieve the region code for each application ID
+panel_lookup AS (
+    SELECT DISTINCT oaap.alr_application_id AS application_id,
+        CASE
+            WHEN oo2.parent_organization_id IS NULL THEN oo2.organization_name
+            WHEN oo3.parent_organization_id IS NULL THEN oo3.organization_name
+            ELSE 'NONE'
+        END AS panel_region
+    FROM oats.oats_alr_application_parties oaap
+        JOIN oats.oats_person_organizations opo ON oaap.person_organization_id = opo.person_organization_id
+        JOIN oats.oats_organizations oo ON opo.organization_id = oo.organization_id
+        LEFT JOIN oats.oats_organizations oo2 ON oo.parent_organization_id = oo2.organization_id
+        LEFT JOIN oats.oats_organizations oo3 ON oo2.parent_organization_id = oo3.organization_id
+    WHERE oo2.organization_type_cd = 'PANEL'
+        OR oo3.organization_type_cd = 'PANEL'
+),
+-- Step 3: Perform lookup to retrieve type code
+application_type_lookup AS (
+    SELECT oaac.alr_application_id AS application_id,
+        oacc."description" AS "description",
+        oaac.alr_change_code AS code
+    FROM oats.oats_alr_appl_components AS oaac
+        JOIN oats.oats_alr_change_codes oacc ON oaac.alr_change_code = oacc.alr_change_code
+        LEFT JOIN oats.alcs_etl_application_exclude aee ON oaac.alr_appl_component_id = aee.component_id
+    WHERE aee.component_id IS NULL
+) -- Step 5: Insert new records into the alcs_applications table
+SELECT oa.alr_application_id::text AS file_number,
+    atl.code AS type_code,
+    'Unknown' as applicant,
+    ar.code AS region_code,
+    alcs_gov.gov_uuid AS local_government_uuid,
+    'oats_etl',
+    CASE
+        WHEN oa.proposal_background_desc IS NOT NULL
+        AND length(oa.proposal_background_desc) > 10 THEN oa.proposal_summary_desc || '. Background: ' || oa.proposal_background_desc
+        ELSE oa.proposal_summary_desc
+    END AS "summary",
+    oa.staff_comment_observations,
+    oa.submitted_to_alc_date
+FROM oats.oats_alr_applications AS oa
+    JOIN oats.alcs_etl_srw_duplicate AS ae ON oa.alr_application_id = ae.application_id
+    AND ae.duplicated IS false
+    LEFT JOIN panel_lookup ON oa.alr_application_id = panel_lookup.application_id
+    LEFT JOIN application_type_lookup AS atl ON oa.alr_application_id = atl.application_id
+    LEFT JOIN alcs.application_region ar ON panel_lookup.panel_region = ar."label"
+    LEFT JOIN alcs_gov ON oa.alr_application_id = alcs_gov.application_id
+WHERE atl.code = 'SRW'
+    AND oa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN') -- filter SRW only
\ No newline at end of file
diff --git a/bin/migrate-oats-data/srw/sql/srw_base_insert_count.sql b/bin/migrate-oats-data/srw/sql/srw_base_insert_count.sql
new file mode 100644
index 0000000000..dead3fe35b
--- /dev/null
+++ b/bin/migrate-oats-data/srw/sql/srw_base_insert_count.sql
@@ -0,0 +1,3 @@
+SELECT count(*)
+From oats.oats_alr_applications AS oa
+    JOIN oats.alcs_etl_srw AS ae ON oa.alr_application_id = ae.alr_application_id
\ No newline at end of file
diff --git a/bin/migrate-oats-data/srw/sql/srw_base_update.sql b/bin/migrate-oats-data/srw/sql/srw_base_update.sql
new file mode 100644
index 0000000000..08dc230f83
--- /dev/null
+++ b/bin/migrate-oats-data/srw/sql/srw_base_update.sql
@@ -0,0 +1,16 @@
+SELECT oaa.alr_application_id,
+    (
+        CASE
+            WHEN oaa.submitted_to_alc_date IS NULL
+            AND MIN(oa.completion_date) IS NULL THEN NULL
+            ELSE LEAST(
+                COALESCE(oaa.submitted_to_alc_date, 'infinity'::timestamp),
+                COALESCE(MIN(oa.completion_date), 'infinity'::timestamp)
+            )
+        END
+    ) AS date_submitted_to_alc
+FROM oats.oats_alr_applications oaa
+    JOIN alcs.notification n ON n.file_number = oaa.alr_application_id::TEXT
+    AND n.type_code = 'SRW'
+    LEFT JOIN oats.oats_accomplishments oa ON oa.alr_application_id = oaa.alr_application_id
+    AND oa.accomplishment_code = 'SAL'
\ No newline at end of file
diff --git a/bin/migrate-oats-data/srw/sql/srw_base_update_count.sql b/bin/migrate-oats-data/srw/sql/srw_base_update_count.sql
new file mode 100644
index 0000000000..4ad3de2f26
--- /dev/null
+++ b/bin/migrate-oats-data/srw/sql/srw_base_update_count.sql
@@ -0,0 +1,4 @@
+SELECT count(*)
+FROM oats.oats_alr_applications oaa
+    JOIN alcs.notification n ON n.file_number = oaa.alr_application_id::TEXT
+    AND n.type_code = 'SRW';
\ No newline at end of file
diff --git a/bin/migrate-oats-data/srw/sql/srw_exclude_count.sql b/bin/migrate-oats-data/srw/sql/srw_exclude_count.sql
new file mode 100644
index 0000000000..b05616315e
--- /dev/null
+++ b/bin/migrate-oats-data/srw/sql/srw_exclude_count.sql
@@ -0,0 +1,14 @@
+with srw_type_lookup AS (
+    SELECT oaac.alr_application_id AS application_id,
+        oaac.alr_change_code AS code
+    FROM oats.oats_alr_appl_components AS oaac
+    WHERE oaac.alr_change_code = 'SRW'
+),
+application_rows as (
+    select count(application_id)
+    from srw_type_lookup stl
+    group by stl.application_id
+    having count(application_id) > 1
+)
+select count(*) as "count"
+from application_rows
\ No newline at end of file
diff --git a/bin/migrate-oats-data/srw/sql/srw_populate_exclude.sql b/bin/migrate-oats-data/srw/sql/srw_populate_exclude.sql
new file mode 100644
index 0000000000..a9d17f4ea8
--- /dev/null
+++ b/bin/migrate-oats-data/srw/sql/srw_populate_exclude.sql
@@ -0,0 +1,100 @@
+DROP TABLE IF EXISTS oats.alcs_etl_srw_duplicate;
+CREATE TABLE oats.alcs_etl_srw_duplicate (
+    id SERIAL PRIMARY KEY,
+    application_id BIGINT,
+    duplicated bool DEFAULT false
+);
+-- function creates table to contain duplicate type code srw ids
+DROP TABLE IF EXISTS oats.alcs_etl_srw_exclude;
+CREATE TABLE oats.alcs_etl_srw_exclude (
+    component_id BIGINT,
+    application_id BIGINT
+);
+DROP TABLE IF EXISTS oats.alcs_etl_srw;
+CREATE TABLE oats.alcs_etl_srw (
+    alr_application_id BIGINT,
+    alr_appl_component_id BIGINT,
+    alr_change_code TEXT,
+    application_class_code TEXT
+);
+-- function inserts data into previously created table and deciphers duplication of uuids
+-- application_id is copied from oats.oats_alr_applications.alr_application_id
+INSERT INTO oats.alcs_etl_srw_duplicate (application_id, duplicated)
+SELECT DISTINCT oa.alr_application_id AS application_id,
+    CASE
+        WHEN ntf.uuid IS NOT NULL THEN TRUE
+        ELSE false
+    END AS duplicated
+FROM oats.oats_alr_applications AS oa
+    LEFT JOIN alcs.notification AS ntf ON oa.alr_application_id::TEXT = ntf.file_number;
+-- Insert values from application-exclude into table
+INSERT INTO oats.alcs_etl_srw_exclude (component_id, application_id) WITH application_type_lookup AS (
+        SELECT oaac.alr_application_id AS application_id,
+            oaac.alr_change_code AS code
+        FROM oats.oats_alr_appl_components AS oaac
+        WHERE oaac.alr_change_code = 'SRW'
+    ),
+    -- Find instances of multi-component applications 
+    multi_app AS (
+        SELECT atl.application_id AS app_id
+        FROM application_type_lookup atl
+        GROUP BY atl.application_id
+        HAVING count(application_id) > 1
+    ),
+    duplicate_ids AS (
+        SELECT alr_application_id,
+            alr_appl_component_id,
+            alr_change_code
+        FROM oats.oats_alr_appl_components oaac
+            RIGHT JOIN multi_app ON oaac.alr_application_id = multi_app.app_id
+    ),
+    -- Order based on established hierarchy 
+    ranked_rows AS (
+        SELECT alr_appl_component_id,
+            ROW_NUMBER() OVER (
+                PARTITION BY dis.alr_application_id
+                ORDER BY CASE
+                        dis.alr_change_code
+                        WHEN 'EXC' THEN 1
+                        WHEN 'INC' THEN 2
+                        WHEN 'SDV' THEN 3
+                        WHEN 'SCH' THEN 4
+                        WHEN 'NFU' THEN 5
+                        WHEN 'CSC' THEN 6
+                        ELSE 7
+                    END
+            ) AS rank,
+            dis.alr_application_id
+        FROM duplicate_ids dis
+    ) -- select all components that will not be inserted
+SELECT rr.alr_appl_component_id,
+    rr.alr_application_id
+FROM ranked_rows rr
+WHERE rank != 1;
+-- populate srw that will be inserted
+INSERT INTO oats.alcs_etl_srw (
+        alr_application_id,
+        alr_appl_component_id,
+        alr_change_code,
+        application_class_code
+    ) WITH components_minus_excluded_components AS (
+        SELECT *
+        FROM oats.oats_alr_appl_components oaac
+            LEFT JOIN oats.alcs_etl_srw_exclude excl ON excl.component_id = oaac.alr_appl_component_id
+        WHERE excl.component_id IS NULL
+    ),
+    filtered_to_single_componets_srw AS (
+        SELECT oaa.alr_application_id,
+            cec.alr_appl_component_id,
+            cec.alr_change_code,
+            oaa.application_class_code
+        FROM components_minus_excluded_components cec
+            JOIN oats.oats_alr_applications oaa ON oaa.alr_application_id = cec.alr_application_id
+        WHERE oaa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN', 'NOI')
+            AND cec.alr_change_code = 'SRW'
+    )
+SELECT fsrw.alr_application_id,
+    fsrw.alr_appl_component_id,
+    fsrw.alr_change_code,
+    fsrw.application_class_code
+FROM filtered_to_single_componets_srw fsrw;
\ No newline at end of file
diff --git a/bin/migrate-oats-data/srw/sql/submission/parcel/srw_parcels_insert.sql b/bin/migrate-oats-data/srw/sql/submission/parcel/srw_parcels_insert.sql
new file mode 100644
index 0000000000..ed5aab5494
--- /dev/null
+++ b/bin/migrate-oats-data/srw/sql/submission/parcel/srw_parcels_insert.sql
@@ -0,0 +1,25 @@
+WITH parcels_to_insert AS (
+    SELECT nos.uuid,
+        osp.subject_property_id
+    FROM alcs.notification_submission nos
+        JOIN oats.oats_subject_properties osp ON osp.alr_application_id = nos.file_number::bigint
+    WHERE osp.alr_application_land_ind = 'Y' -- ensure that only parcels related to application are selected
+        AND nos.type_code = 'SRW'
+),
+grouped_oats_property_interests_ids AS (
+    SELECT subject_property_id
+    FROM oats.oats_property_interests opi
+    GROUP BY opi.subject_property_id
+)
+SELECT uuid AS notification_submission_uuid,
+    op.civic_address,
+    op.legal_description,
+    op.area_size,
+    op.pid,
+    op.pin,
+    osp.subject_property_id,
+    op.property_id
+FROM parcels_to_insert pti
+    JOIN oats.oats_subject_properties osp ON osp.subject_property_id = pti.subject_property_id
+    JOIN oats.oats_properties op ON op.property_id = osp.property_id
+    LEFT JOIN grouped_oats_property_interests_ids gopi ON gopi.subject_property_id = pti.subject_property_id
\ No newline at end of file
diff --git a/bin/migrate-oats-data/srw/sql/submission/parcel/srw_parcels_insert_count.sql b/bin/migrate-oats-data/srw/sql/submission/parcel/srw_parcels_insert_count.sql
new file mode 100644
index 0000000000..a47e285ccd
--- /dev/null
+++ b/bin/migrate-oats-data/srw/sql/submission/parcel/srw_parcels_insert_count.sql
@@ -0,0 +1,18 @@
+WITH parcels_to_insert AS (
+    SELECT nos.uuid,
+        osp.subject_property_id
+    FROM alcs.notification_submission nos
+        JOIN oats.oats_subject_properties osp ON osp.alr_application_id = nos.file_number::bigint
+    WHERE osp.alr_application_land_ind = 'Y' -- ensure that only parcels related to application are selected
+        AND nos.type_code = 'SRW'
+),
+grouped_oats_property_interests_ids AS (
+    SELECT subject_property_id
+    FROM oats.oats_property_interests opi
+    GROUP BY opi.subject_property_id
+)
+SELECT count(*)
+FROM parcels_to_insert pti
+    JOIN oats.oats_subject_properties osp ON osp.subject_property_id = pti.subject_property_id
+    JOIN oats.oats_properties op ON op.property_id = osp.property_id
+    LEFT JOIN grouped_oats_property_interests_ids gopi ON gopi.subject_property_id = pti.subject_property_id
\ No newline at end of file
diff --git a/bin/migrate-oats-data/srw/sql/submission/proposal_fields/srw_proposal_fields.sql b/bin/migrate-oats-data/srw/sql/submission/proposal_fields/srw_proposal_fields.sql
new file mode 100644
index 0000000000..53f73784e8
--- /dev/null
+++ b/bin/migrate-oats-data/srw/sql/submission/proposal_fields/srw_proposal_fields.sql
@@ -0,0 +1,16 @@
+SELECT oaa.alr_application_id,
+    oaa.applicant_file_no,
+    n.summary,
+    CASE
+        WHEN oaa.plan_no IS NOT NULL
+        OR oaa.control_no IS NOT NULL THEN TRUE
+        ELSE FALSE
+    END AS has_survey_plan,
+    au."uuid",
+    oaac.component_area
+FROM oats.oats_alr_applications oaa
+    JOIN alcs.notification_submission nos ON nos.file_number = oaa.alr_application_id::TEXT AND type_code = 'SRW'
+    JOIN alcs.notification n ON n.file_number = nos.file_number
+    JOIN oats.alcs_etl_srw aes ON aes.alr_application_id = oaa.alr_application_id
+    JOIN oats.oats_alr_appl_components oaac ON oaac.alr_appl_component_id = aes.alr_appl_component_id
+    LEFT JOIN alcs."user" au ON oaa.created_guid = au.bceid_guid
\ No newline at end of file
diff --git a/bin/migrate-oats-data/srw/sql/submission/proposal_fields/srw_proposal_fields_count.sql b/bin/migrate-oats-data/srw/sql/submission/proposal_fields/srw_proposal_fields_count.sql
new file mode 100644
index 0000000000..497db2d2c6
--- /dev/null
+++ b/bin/migrate-oats-data/srw/sql/submission/proposal_fields/srw_proposal_fields_count.sql
@@ -0,0 +1,4 @@
+SELECT count(*)
+FROM oats.oats_alr_applications oaa
+    JOIN alcs.notification_submission nos ON nos.file_number = oaa.alr_application_id::TEXT
+    LEFT JOIN alcs."user" au ON oaa.created_guid = au.bceid_guid
\ No newline at end of file
diff --git a/bin/migrate-oats-data/srw/sql/submission/srw_submission_init.sql b/bin/migrate-oats-data/srw/sql/submission/srw_submission_init.sql
new file mode 100644
index 0000000000..d56cefd6f6
--- /dev/null
+++ b/bin/migrate-oats-data/srw/sql/submission/srw_submission_init.sql
@@ -0,0 +1,16 @@
+WITH srw_components_grouped AS (
+    SELECT *
+    FROM oats.alcs_etl_srw oaa
+    WHERE oaa.application_class_code = 'NAN'
+        and oaa.alr_change_code = 'SRW'
+)
+SELECT n.file_number,
+    n.type_code,
+    n.local_government_uuid,
+    oc.alr_change_code,
+    srwg.alr_application_id,
+    oc.alr_appl_component_id
+FROM srw_components_grouped srwg
+    LEFT JOIN alcs.notification n ON n.file_number = srwg.alr_application_id::TEXT
+    AND n.type_code = 'SRW'
+    JOIN oats.oats_alr_appl_components oc ON srwg.alr_appl_component_id = oc.alr_appl_component_id
\ No newline at end of file
diff --git a/bin/migrate-oats-data/srw/sql/submission/srw_submission_init_count.sql b/bin/migrate-oats-data/srw/sql/submission/srw_submission_init_count.sql
new file mode 100644
index 0000000000..aa45b9badd
--- /dev/null
+++ b/bin/migrate-oats-data/srw/sql/submission/srw_submission_init_count.sql
@@ -0,0 +1,8 @@
+WITH srw_components_grouped AS (
+    SELECT oaa.alr_application_id
+    FROM oats.alcs_etl_applications_nois oaa
+    WHERE oaa.application_class_code = 'NAN'
+        and oaa.alr_change_code = 'SRW'
+)
+SELECT count(*)
+FROM srw_components_grouped srwg
\ No newline at end of file
diff --git a/bin/migrate-oats-data/srw/sql/submission/transferee/srw_transferee.sql b/bin/migrate-oats-data/srw/sql/submission/transferee/srw_transferee.sql
new file mode 100644
index 0000000000..2ae4b45bcd
--- /dev/null
+++ b/bin/migrate-oats-data/srw/sql/submission/transferee/srw_transferee.sql
@@ -0,0 +1,21 @@
+SELECT oaap.alr_application_party_id,
+    op.person_id,
+    op.first_name,
+    op.last_name,
+    op.middle_name,
+    oo.organization_id,
+    oo.organization_name,
+    oo.alias_name,
+    opo.phone_number,
+    opo.cell_phone_number,
+    opo.email_address,
+    oaap.alr_appl_role_code,
+    oaap.alr_application_id,
+    ns."uuid" AS notification_submission_uuid
+FROM oats.oats_alr_application_parties oaap
+    JOIN oats.oats_person_organizations opo ON opo.person_organization_id = oaap.person_organization_id
+    LEFT JOIN oats.oats_organizations oo ON oo.organization_id = opo.organization_id
+    LEFT JOIN oats.oats_persons op ON op.person_id = opo.person_id
+    JOIN alcs.notification_submission ns ON ns.file_number = oaap.alr_application_id::TEXT
+    AND ns.type_code = 'SRW'
+WHERE oaap.alr_appl_role_code = 'APPL'
\ No newline at end of file
diff --git a/bin/migrate-oats-data/srw/sql/submission/transferee/srw_transferee_count.sql b/bin/migrate-oats-data/srw/sql/submission/transferee/srw_transferee_count.sql
new file mode 100644
index 0000000000..d3147970a9
--- /dev/null
+++ b/bin/migrate-oats-data/srw/sql/submission/transferee/srw_transferee_count.sql
@@ -0,0 +1,8 @@
+SELECT count(*)
+FROM oats.oats_alr_application_parties oaap
+    JOIN oats.oats_person_organizations opo ON opo.person_organization_id = oaap.person_organization_id
+    LEFT JOIN oats.oats_organizations oo ON oo.organization_id = opo.organization_id
+    LEFT JOIN oats.oats_persons op ON op.person_id = opo.person_id
+    JOIN alcs.notification_submission ns ON ns.file_number = oaap.alr_application_id::TEXT
+    AND ns.type_code = 'SRW'
+WHERE oaap.alr_appl_role_code = 'APPL';
\ No newline at end of file
diff --git a/bin/migrate-oats-data/srw/srw_base.py b/bin/migrate-oats-data/srw/srw_base.py
new file mode 100644
index 0000000000..bb056f20d6
--- /dev/null
+++ b/bin/migrate-oats-data/srw/srw_base.py
@@ -0,0 +1,141 @@
+from db import inject_conn_pool
+from common import (
+    setup_and_get_logger,
+    BATCH_UPLOAD_SIZE,
+)
+
+etl_name = "init_srw_base"
+logger = setup_and_get_logger(etl_name)
+
+
+@inject_conn_pool
+def init_srw_base(conn=None, batch_size=BATCH_UPLOAD_SIZE):
+    """
+    function uses a decorator pattern @inject_conn_pool to inject a database connection pool to the function.
+    It fetches the total count of SRWs to import and prints it to the console.
+    Then, it fetches the SRWs to insert in batches using application IDs / file_number, constructs an insert query, and processes them.
+    """
+    logger.info(f"Start {etl_name}")
+    with conn.cursor() as cursor:
+        _exclusion_table_create(cursor, conn)
+
+        with open(
+            "srw/sql/srw_base_insert_count.sql", "r", encoding="utf-8"
+        ) as sql_file:
+            count_query = sql_file.read()
+            cursor.execute(count_query)
+            count_total = cursor.fetchone()[0]
+        logger.info(f"SRWs to insert: {count_total}")
+
+        _exclusion_table_count(cursor, logger)
+
+        failed_inserts = 0
+        successful_inserts_count = 0
+        last_row_id = 0
+
+        with open("srw/sql/srw_base_insert.sql", "r", encoding="utf-8") as sql_file:
+            application_sql = sql_file.read()
+            while True:
+                cursor.execute(
+                    f"""{application_sql} 
+                        AND ae.application_id > {last_row_id} AND (oa.application_class_code IN ('LOA', 'BLK', 'SCH', 'NAN')) ORDER by ae.application_id;
+                    """
+                )
+
+                rows = cursor.fetchmany(batch_size)
+                if not rows:
+                    break
+                try:
+                    rows_to_be_inserted_count = len(rows)
+
+                    insert_query = _compile_insert_query(rows_to_be_inserted_count)
+                    cursor.execute(insert_query, rows)
+                    conn.commit()
+
+                    last_row_id = rows[-1][0]
+                    successful_inserts_count = (
+                        successful_inserts_count + rows_to_be_inserted_count
+                    )
+
+                    logger.debug(
+                        f"retrieved/inserted items count: {rows_to_be_inserted_count}; total successfully inserted/updated rows so far {successful_inserts_count}; last inserted application_id: {last_row_id}"
+                    )
+                except Exception as err:
+                    logger.exception(err)
+                    conn.rollback()
+                    failed_inserts = count_total - successful_inserts_count
+                    last_row_id = last_row_id + 1
+
+    logger.info(f"Total amount of successful inserts: {successful_inserts_count}")
+    logger.info(f"Total failed inserts: {failed_inserts}")
+
+    if failed_inserts == 0:
+        with conn.cursor() as cursor:
+            cursor.execute(_drop_etl_temp_table())
+            logger.info("etl temp table removed")
+
+    else:
+        logger.error("Table not deleted, inserts failed")
+
+
+@inject_conn_pool
+def clean_initial_srw(conn=None):
+    logger.info("Start SRW cleaning")
+    with conn.cursor() as cursor:
+        cursor.execute(
+            "DELETE FROM alcs.notification a WHERE a.audit_created_by = 'oats_etl' and a.audit_updated_by is NULL"
+        )
+        logger.info(f"Deleted items count = {cursor.rowcount}")
+        cursor.execute("DROP TABLE IF EXISTS oats.alcs_etl_srw_exclude")
+        cursor.execute("DROP TABLE IF EXISTS oats.alcs_etl_srw_duplicate")
+        logger.info(f"Temporary tables dropped")
+
+    conn.commit()
+
+
+def _compile_insert_query(number_of_rows_to_insert):
+    """
+    function takes the number of rows to insert and generates an SQL insert statement with upserts using the ON CONFLICT clause
+    """
+
+    applications_to_insert = ",".join(["%s"] * number_of_rows_to_insert)
+    return f"""
+        WITH cte AS (
+            SELECT file_number, type_code, applicant, region_code, local_government_uuid::UUID, audit_created_by, summary, staff_comment_observations,
+            ROW_NUMBER() OVER (PARTITION BY file_number, type_code, applicant, region_code, audit_created_by, summary, staff_comment_observations  ORDER BY local_government_uuid) AS rn
+            FROM (VALUES{applications_to_insert}) AS t(file_number, type_code, applicant, region_code, local_government_uuid, audit_created_by, summary, staff_comment_observations)
+        )
+        INSERT INTO alcs.notification (file_number, type_code, 
+                                      applicant, region_code, local_government_uuid, audit_created_by, summary, staff_observations)
+        SELECT file_number, type_code, applicant, region_code, local_government_uuid, audit_created_by, summary, staff_comment_observations FROM cte WHERE rn = 1
+        ON CONFLICT (file_number) DO UPDATE SET
+            type_code = EXCLUDED.type_code,
+            applicant = COALESCE((CASE WHEN EXCLUDED.applicant = 'Unknown' THEN alcs.notification.applicant ELSE EXCLUDED.applicant END), EXCLUDED.applicant),
+            region_code = COALESCE(EXCLUDED.region_code, alcs.notification.region_code),
+            local_government_uuid = COALESCE(EXCLUDED.local_government_uuid, alcs.notification.local_government_uuid),
+            audit_created_by = EXCLUDED.audit_created_by,
+            summary = EXCLUDED.summary,
+            staff_observations = EXCLUDED.staff_observations
+    """
+
+
+def _drop_etl_temp_table():
+    return f"""
+        DROP TABLE IF EXISTS oats.alcs_etl_application_duplicate;
+    """
+
+
+def _exclusion_table_create(cursor, conn):
+    with open("srw/sql/srw_populate_exclude.sql", "r", encoding="utf-8") as sql_file:
+        create_tables = sql_file.read()
+        cursor.execute(create_tables)
+    conn.commit()
+
+
+def _exclusion_table_count(cursor, logger):
+    with open("srw/sql/srw_exclude_count.sql", "r", encoding="utf-8") as sql_file:
+        count_exclude = sql_file.read()
+        cursor.execute(count_exclude)
+        count_total_exclude = cursor.fetchone()[0]
+    logger.info(f"Oats applications with excluded components: {count_total_exclude}")
+    logger.debug("Component ids stored in oats.alcs_etl_srw_exclude")
diff --git a/bin/migrate-oats-data/srw/srw_base_update.py b/bin/migrate-oats-data/srw/srw_base_update.py
new file mode 100644
index 0000000000..3f5ae1d12f
--- /dev/null
+++ b/bin/migrate-oats-data/srw/srw_base_update.py
@@ -0,0 +1,115 @@
+from common import (
+    BATCH_UPLOAD_SIZE,
+    setup_and_get_logger,
+    add_timezone_and_keep_date_part,
+)
+from db import inject_conn_pool
+from psycopg2.extras import RealDictCursor, execute_batch
+
+etl_name = "update_srw_base_fields"
+logger = setup_and_get_logger(etl_name)
+
+
+@inject_conn_pool
+def update_srw_base_fields(conn=None, batch_size=BATCH_UPLOAD_SIZE):
+    """
+    This function is responsible for populating date_submitted_to_alc in alcs.notification in ALCS.
+
+    Args:
+    conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator.
+    batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE.
+    """
+
+    logger.info("Start update srw base fields")
+    with conn.cursor(cursor_factory=RealDictCursor) as cursor:
+        with open(
+            "srw/sql/srw_base_update_count.sql",
+            "r",
+            encoding="utf-8",
+        ) as sql_file:
+            count_query = sql_file.read()
+            cursor.execute(count_query)
+            count_total = dict(cursor.fetchone())["count"]
+        logger.info(f"Total SRW data to update: {count_total}")
+
+        failed_inserts = 0
+        successful_updates_count = 0
+        last_application_id = 0
+
+        with open(
+            "srw/sql/srw_base_update.sql",
+            "r",
+            encoding="utf-8",
+        ) as sql_file:
+            query = sql_file.read()
+            while True:
+                cursor.execute(
+                    f"""
+                        {query} 
+                        WHERE oaa.alr_application_id > {last_application_id}
+                        GROUP BY oaa.alr_application_id 
+                        ORDER BY oaa.alr_application_id;
+                    """
+                )
+
+                rows = cursor.fetchmany(batch_size)
+
+                if not rows:
+                    break
+                try:
+                    updated_data = _update_base_fields(conn, batch_size, cursor, rows)
+
+                    successful_updates_count = successful_updates_count + len(
+                        updated_data
+                    )
+                    last_application_id = dict(updated_data[-1])["alr_application_id"]
+
+                    logger.debug(
+                        f"Retrieved/updated items count: {len(updated_data)}; total successfully updated SRW so far {successful_updates_count}; last updated application_id: {last_application_id}"
+                    )
+                except Exception as err:
+                    # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost
+                    logger.exception(err)
+                    conn.rollback()
+                    failed_inserts = count_total - successful_updates_count
+                    last_application_id = last_application_id + 1
+
+    logger.info(
+        f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts}"
+    )
+
+
+def _update_base_fields(conn, batch_size, cursor, rows):
+    parsed_data_list = _prepare_oats_srw_data(rows)
+
+    execute_batch(
+        cursor,
+        _rx_items_query,
+        parsed_data_list,
+        page_size=batch_size,
+    )
+
+    conn.commit()
+    return parsed_data_list
+
+
+_rx_items_query = """
+                    UPDATE alcs.notification 
+                    SET date_submitted_to_alc = %(date_submitted_to_alc)s
+                    WHERE alcs.notification.file_number = %(alr_application_id)s::text
+"""
+
+
+def _prepare_oats_srw_data(row_data_list):
+    mapped_data_list = []
+    for row in row_data_list:
+        mapped_data_list.append(
+            {
+                "alr_application_id": row["alr_application_id"],
+                "date_submitted_to_alc": add_timezone_and_keep_date_part(
+                    row["date_submitted_to_alc"]
+                ),
+            }
+        )
+
+    return mapped_data_list
diff --git a/bin/migrate-oats-data/srw/submission/__init__.py b/bin/migrate-oats-data/srw/submission/__init__.py
new file mode 100644
index 0000000000..ce795a0a78
--- /dev/null
+++ b/bin/migrate-oats-data/srw/submission/__init__.py
@@ -0,0 +1,2 @@
+from .srw_submission_init import init_srw_submissions, clean_srw_submissions
+from .srw_proposal_fields import process_alcs_srw_proposal_fields
diff --git a/bin/migrate-oats-data/srw/submission/parcel/__init__.py b/bin/migrate-oats-data/srw/submission/parcel/__init__.py
new file mode 100644
index 0000000000..fa6b1a778b
--- /dev/null
+++ b/bin/migrate-oats-data/srw/submission/parcel/__init__.py
@@ -0,0 +1 @@
+from .srw_parcel_init import init_srw_parcels, clean_parcels
diff --git a/bin/migrate-oats-data/srw/submission/parcel/srw_parcel_init.py b/bin/migrate-oats-data/srw/submission/parcel/srw_parcel_init.py
new file mode 100644
index 0000000000..e3902f0bb7
--- /dev/null
+++ b/bin/migrate-oats-data/srw/submission/parcel/srw_parcel_init.py
@@ -0,0 +1,153 @@
+from common import (
+    BATCH_UPLOAD_SIZE,
+    setup_and_get_logger,
+    OATS_ETL_USER,
+    OatsToAlcsOwnershipType,
+    to_alcs_format,
+    get_now_with_offset,
+)
+from db import inject_conn_pool
+from psycopg2.extras import RealDictCursor
+
+etl_name = "init_srw_parcels"
+logger = setup_and_get_logger(etl_name)
+
+
+@inject_conn_pool
+def init_srw_parcels(conn=None, batch_size=BATCH_UPLOAD_SIZE):
+    logger.info(f"Start {etl_name}")
+
+    with conn.cursor(cursor_factory=RealDictCursor) as cursor:
+        with open(
+            "srw/sql/submission/parcel/srw_parcels_insert_count.sql",
+            "r",
+            encoding="utf-8",
+        ) as sql_file:
+            count_query = sql_file.read()
+            cursor.execute(count_query)
+            count_total = dict(cursor.fetchone())["count"]
+        logger.info(f"Total Notification Parcels to insert: {count_total}")
+
+        failed_inserts = 0
+        successful_inserts_count = 0
+        last_subject_property_id = 0
+
+        with open(
+            "srw/sql/submission/parcel/srw_parcels_insert.sql",
+            "r",
+            encoding="utf-8",
+        ) as sql_file:
+            application_sql = sql_file.read()
+            while True:
+                cursor.execute(
+                    f"""
+                        {application_sql}
+                        WHERE osp.subject_property_id > {last_subject_property_id} ORDER BY osp.subject_property_id;
+                    """
+                )
+
+                rows = cursor.fetchmany(batch_size)
+
+                if not rows:
+                    break
+                try:
+                    records_to_be_inserted_count = len(rows)
+
+                    _insert_records(conn, cursor, rows, successful_inserts_count)
+
+                    successful_inserts_count = (
+                        successful_inserts_count + records_to_be_inserted_count
+                    )
+
+                    last_subject_property_id = dict(rows[-1])["subject_property_id"]
+
+                    logger.debug(
+                        f"inserted items count: {records_to_be_inserted_count}; total successfully inserted Notification Parcels so far {successful_inserts_count}; last inserted subject_property_id: {last_subject_property_id}"
+                    )
+                except Exception as err:
+                    logger.exception(err)
+                    conn.rollback()
+                    failed_inserts = count_total - successful_inserts_count
+                    last_subject_property_id = last_subject_property_id + 1
+
+    logger.info(
+        f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}"
+    )
+
+
+def _insert_records(conn, cursor, rows, insert_index):
+    number_of_rows_to_insert = len(rows)
+
+    if number_of_rows_to_insert > 0:
+        insert_query = _compile_parcel_insert_query(number_of_rows_to_insert)
+        rows_to_insert = _prepare_data_to_insert(rows, insert_index)
+        cursor.execute(insert_query, rows_to_insert)
+        conn.commit()
+
+
+def _prepare_data_to_insert(rows, insert_index):
+    row_without_last_element = []
+    for row in rows:
+        mapped_row = _map_data(row, insert_index)
+        row_without_last_element.append(tuple(mapped_row.values()))
+        insert_index += 1
+
+    return row_without_last_element
+
+
+def _map_data(row, insert_index):
+    return {
+        "notification_submission_uuid": row["notification_submission_uuid"],
+        "audit_created_by": OATS_ETL_USER,
+        "audit_created_at": to_alcs_format(get_now_with_offset(insert_index)),
+        "civic_address": row["civic_address"],
+        "legal_description": row["legal_description"],
+        "map_area_hectares": row["area_size"],
+        "ownership_type_code": _map_ownership_type_code(row),
+        "pid": row["pid"],
+        "pin": row["pin"],
+        "oats_subject_property_id": row["subject_property_id"],
+        "oats_property_id": row["property_id"],
+    }
+
+
+def _map_ownership_type_code(data):
+    return (
+        OatsToAlcsOwnershipType.CROWN.value
+        if data["pin"]
+        else OatsToAlcsOwnershipType.FEE.value
+    )
+
+
+def _compile_parcel_insert_query(number_of_rows_to_insert):
+    parcels_to_insert = ",".join(["%s"] * number_of_rows_to_insert)
+    return f"""
+                    INSERT INTO alcs.notification_parcel 
+                    (
+                        notification_submission_uuid, 
+                        audit_created_by, 
+                        audit_created_at,
+                        civic_address,
+                        legal_description,
+                        map_area_hectares,
+                        ownership_type_code,
+                        pid,
+                        pin,
+                        oats_subject_property_id,
+                        oats_property_id
+                    )
+                    VALUES{parcels_to_insert}
+                    ON CONFLICT DO NOTHING
+                """
+
+
+@inject_conn_pool
+def clean_parcels(conn=None):
+    logger.info("Start notification parcel cleaning")
+    with conn.cursor() as cursor:
+        cursor.execute(
+            "DELETE FROM alcs.notification_parcel nop WHERE nop.audit_created_by = 'oats_etl' AND nop.audit_updated_by IS NULL"
+        )
+        logger.info(f"Deleted items count = {cursor.rowcount}")
+    conn.commit()
+    logger.info("Done notification parcel cleaning")
diff --git a/bin/migrate-oats-data/srw/submission/srw_proposal_fields.py b/bin/migrate-oats-data/srw/submission/srw_proposal_fields.py
new file mode 100644
index 0000000000..505eced71d
--- /dev/null
+++ b/bin/migrate-oats-data/srw/submission/srw_proposal_fields.py
@@ -0,0 +1,121 @@
+from common import BATCH_UPLOAD_SIZE, setup_and_get_logger
+from db import inject_conn_pool
+from psycopg2.extras import RealDictCursor, execute_batch
+
+etl_name = "process_alcs_srw_proposal_fields"
+logger = setup_and_get_logger(etl_name)
+
+
+@inject_conn_pool
+def process_alcs_srw_proposal_fields(conn=None, batch_size=BATCH_UPLOAD_SIZE):
+    """
+    This function is responsible for populating of the notification_submission in ALCS: proposal fields and soil fields populated with default values.
+
+    Args:
+    conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator.
+    batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE.
+    """
+
+    logger.info(f"Start {etl_name}")
+    with conn.cursor(cursor_factory=RealDictCursor) as cursor:
+        with open(
+            "srw/sql/submission/proposal_fields/srw_proposal_fields_count.sql",
+            "r",
+            encoding="utf-8",
+        ) as sql_file:
+            count_query = sql_file.read()
+            cursor.execute(count_query)
+            count_total = dict(cursor.fetchone())["count"]
+        logger.info(f"Total SRW data to update: {count_total}")
+
+        failed_inserts = 0
+        successful_updates_count = 0
+        last_application_id = 0
+
+        with open(
+            "srw/sql/submission/proposal_fields/srw_proposal_fields.sql",
+            "r",
+            encoding="utf-8",
+        ) as sql_file:
+            application_sql = sql_file.read()
+            while True:
+                cursor.execute(
+                    f"""
+                        {application_sql} 
+                        WHERE oaa.alr_application_id > {last_application_id} ORDER BY oaa.alr_application_id;
+                    """
+                )
+
+                rows = cursor.fetchmany(batch_size)
+
+                if not rows:
+                    break
+                try:
+                    records_to_be_updated_count = len(rows)
+
+                    _update_records(conn, batch_size, cursor, rows)
+
+                    successful_updates_count = (
+                        successful_updates_count + records_to_be_updated_count
+                    )
+                    last_application_id = dict(rows[-1])["alr_application_id"]
+
+                    logger.debug(
+                        f"retrieved/updated items count: {records_to_be_updated_count}; total successfully updated SRWs so far {successful_updates_count}; last updated alr_application_id: {last_application_id}"
+                    )
+                except Exception as err:
+                    # this is NOT going to be caused by actual data update failure. This code is only executed when the code error appears or connection to DB is lost
+                    logger.exception(err)
+                    conn.rollback()
+                    failed_inserts = count_total - successful_updates_count
+                    last_application_id = last_application_id + 1
+
+    logger.info(
+        f"Finished {etl_name}: total amount of successful updates {successful_updates_count}, total failed updates {failed_inserts}"
+    )
+
+
+def _update_records(conn, batch_size, cursor, rows):
+    parsed_data_list = _prepare_oats_data(rows)
+
+    if len(parsed_data_list) > 0:
+        execute_batch(
+            cursor,
+            _update_query,
+            parsed_data_list,
+            page_size=batch_size,
+        )
+
+    conn.commit()
+
+
+_update_query = """
+                    UPDATE
+                        alcs.notification_submission
+                    SET
+                        created_by_uuid = %(created_by_uuid)s,
+                        has_survey_plan = %(has_survey_plan)s,
+                        purpose= %(purpose)s,
+                        submitters_file_number = %(submitters_file_number)s,
+                        total_area = %(total_area)s
+                    WHERE
+                        alcs.notification_submission.file_number = %(file_number)s::TEXT
+"""
+
+
+def _prepare_oats_data(row_data_list):
+    data_list = []
+    for row in row_data_list:
+        data_list.append(_map_fields(dict(row)))
+    return data_list
+
+
+def _map_fields(data):
+    return {
+        "created_by_uuid": data["uuid"],
+        "has_survey_plan": data["has_survey_plan"],
+        "purpose": data["summary"],
+        "submitters_file_number": data["applicant_file_no"],
+        "total_area": data["component_area"],
+        "file_number": data["alr_application_id"],
+    }
diff --git a/bin/migrate-oats-data/srw/submission/srw_submission_init.py b/bin/migrate-oats-data/srw/submission/srw_submission_init.py
new file mode 100644
index 0000000000..3c3d57a4c8
--- /dev/null
+++ b/bin/migrate-oats-data/srw/submission/srw_submission_init.py
@@ -0,0 +1,120 @@
+from common import BATCH_UPLOAD_SIZE, OATS_ETL_USER, setup_and_get_logger
+from db import inject_conn_pool
+from psycopg2.extras import RealDictCursor, execute_batch
+
+etl_name = "init_srw_submissions"
+logger = setup_and_get_logger(etl_name)
+
+
+@inject_conn_pool
+def init_srw_submissions(conn=None, batch_size=BATCH_UPLOAD_SIZE):
+    """
+    This function is responsible for initializing the srw_submission in ALCS.
+
+    Args:
+    conn (psycopg2.extensions.connection): PostgreSQL database connection. Provided by the decorator.
+    batch_size (int): The number of items to process at once. Defaults to BATCH_UPLOAD_SIZE.
+    """
+
+    logger.info(f"Start {etl_name}")
+    with conn.cursor(cursor_factory=RealDictCursor) as cursor:
+        with open(
+            "srw/sql/submission/srw_submission_init_count.sql",
+            "r",
+            encoding="utf-8",
+        ) as sql_file:
+            count_query = sql_file.read()
+            cursor.execute(count_query)
+            count_total = dict(cursor.fetchone())["count"]
+        logger.info(f"Total SRW Submission data to insert: {count_total}")
+
+        failed_inserts = 0
+        successful_inserts_count = 0
+        last_submission_id = 0
+
+        with open(
+            "srw/sql/submission/srw_submission_init.sql",
+            "r",
+            encoding="utf-8",
+        ) as sql_file:
+            submission_sql = sql_file.read()
+            while True:
+                cursor.execute(
+                    f"{submission_sql} WHERE srwg.alr_application_id > {last_submission_id} ORDER BY srwg.alr_application_id;"
+                )
+
+                rows = cursor.fetchmany(batch_size)
+
+                if not rows:
+                    break
+                try:
+                    submissions_to_be_inserted_count = len(rows)
+
+                    _insert_srw_submissions(conn, batch_size, cursor, rows)
+
+                    successful_inserts_count = (
+                        successful_inserts_count + submissions_to_be_inserted_count
+                    )
+                    last_submission_id = dict(rows[-1])["alr_application_id"]
+
+                    logger.debug(
+                        f"retrieved/inserted items count: {submissions_to_be_inserted_count}; total successfully inserted submissions so far {successful_inserts_count}; last inserted alr_application_id: {last_submission_id}"
+                    )
+                except Exception as err:
+                    logger.exception(err)
+                    conn.rollback()
+                    failed_inserts = count_total - successful_inserts_count
+                    last_submission_id = last_submission_id + 1
+
+    logger.info(
+        f"Finished {etl_name}: total amount of successful inserts {successful_inserts_count}, total failed inserts {failed_inserts}"
+    )
+
+
+def _insert_srw_submissions(conn, batch_size, cursor, rows):
+    query = _get_insert_query()
+    parsed_data_list = _prepare_oats_alr_applications_data(rows)
+
+    if len(parsed_data_list) > 0:
+        execute_batch(cursor, query, parsed_data_list, page_size=batch_size)
+
+    conn.commit()
+
+
+def _get_insert_query():
+    query = f"""
+                INSERT INTO alcs.notification_submission (
+                    file_number,
+                    local_government_uuid,
+                    type_code,
+                    audit_created_by,
+                    applicant
+                )
+                VALUES (
+                    %(file_number)s,
+                    %(local_government_uuid)s,
+                    %(type_code)s,
+                    '{OATS_ETL_USER}',
+                    'Unknown'
+                )
+    """
+    return query
+
+
+def _prepare_oats_alr_applications_data(row_data_list):
+    data_list = []
+    for row in row_data_list:
+        data_list.append(dict(row))
+    return data_list
+
+
+@inject_conn_pool
+def clean_srw_submissions(conn=None):
+    logger.info("Start srw_submissions cleaning")
+    with conn.cursor() as cursor:
+        cursor.execute(
+            f"DELETE FROM alcs.notification_submission nos WHERE nos.audit_created_by = '{OATS_ETL_USER}' and nos.audit_updated_by is NULL"
+        )
+        logger.info(f"Deleted items count = {cursor.rowcount}")
+
+    conn.commit()
diff --git a/bin/migrate-oats-data/srw/submission/transferee/__init__.py b/bin/migrate-oats-data/srw/submission/transferee/__init__.py
new file mode 100644
index 0000000000..1d30fea57c
--- /dev/null
+++ b/bin/migrate-oats-data/srw/submission/transferee/__init__.py
@@ -0,0 +1 @@
+from .srw_init_transferee import init_srw_parcel_transferee
diff --git a/bin/migrate-oats-data/srw/submission/transferee/srw_init_transferee.py b/bin/migrate-oats-data/srw/submission/transferee/srw_init_transferee.py
new file mode 100644
index 0000000000..1e46d4f077
--- /dev/null
+++ b/bin/migrate-oats-data/srw/submission/transferee/srw_init_transferee.py
@@ -0,0 +1,169 @@
+from common import (
+    setup_and_get_logger,
+    BATCH_UPLOAD_SIZE,
+    OATS_ETL_USER,
+    to_alcs_format,
+    get_now_with_offset,
+    ALCSOwnershipType,
+    ALCSOwnerType,
+)
+from db import inject_conn_pool
+from psycopg2.extras import RealDictCursor
+
+etl_name = "process_srw_parcel_transferee"
+logger = setup_and_get_logger(etl_name)
+
+
+@inject_conn_pool
+def init_srw_parcel_transferee(conn=None, batch_size=BATCH_UPLOAD_SIZE):
+    logger.info(f"Start {etl_name}")
+    with conn.cursor(cursor_factory=RealDictCursor) as cursor:
+        with open(
+            "srw/sql/submission/transferee/srw_transferee_count.sql",
+            "r",
+            encoding="utf-8",
+        ) as sql_file:
+            count_query = sql_file.read()
+            cursor.execute(count_query)
+            count_total = dict(cursor.fetchone())["count"]
+        logger.info(f"Total Notification Transferee data to insert: {count_total}")
+
+        failed_inserts = 0
+        successful_insert_count = 0
+        last_application_id = 0
+
+        with open(
+            "srw/sql/submission/transferee/srw_transferee.sql",
+            "r",
+            encoding="utf-8",
+        ) as sql_file:
+            query = sql_file.read()
+            while True:
+                cursor.execute(
+                    f"""
+                        {query} 
+                        AND oaap.alr_application_id > {last_application_id} ORDER BY oaap.alr_application_id;
+                    """
+                )
+
+                rows = cursor.fetchmany(batch_size)
+
+                if not rows:
+                    break
+                try:
+                    records_to_be_inserted_count = len(rows)
+
+                    _insert_records(conn, cursor, rows, successful_insert_count)
+
+                    successful_insert_count = (
+                        successful_insert_count + records_to_be_inserted_count
+                    )
+
+                    last_application_id = dict(rows[-1])["alr_application_id"]
+
+                    logger.debug(
+                        f"retrieved/updated items count: {records_to_be_inserted_count}; total successfully inserted Notification Transferees so far {successful_insert_count}; last updated {last_application_id}"
+                    )
+                except Exception as err:
+                    logger.exception(err)
+                    conn.rollback()
+                    failed_inserts = count_total - successful_insert_count
+                    last_application_id = last_application_id + 1
+
+    logger.info(
+        f"Finished {etl_name}: total amount of successful inserts {successful_insert_count}, total failed inserts {failed_inserts}"
+    )
+
+
+def _insert_records(conn, cursor, rows, insert_index):
+    number_of_rows_to_insert = len(rows)
+
+    if number_of_rows_to_insert > 0:
+        insert_query = _compile_insert_query(number_of_rows_to_insert)
+        rows_to_insert = _prepare_data_to_insert(rows, insert_index)
+        cursor.execute(insert_query, rows_to_insert)
+        print("commit records")
+        conn.commit()
+
+
+def _compile_insert_query(number_of_rows_to_insert):
+    records_to_insert = ",".join(["%s"] * number_of_rows_to_insert)
+    return f"""
+                        INSERT INTO alcs.notification_transferee(
+                            audit_created_by,
+                            audit_created_at,
+                            email,
+                            first_name, 
+                            last_name,
+                            notification_submission_uuid, 
+                            organization_name, 
+                            phone_number, 
+                            type_code,
+                            oats_alr_application_party_id
+                        )
+                        VALUES{records_to_insert}
+                        ON CONFLICT DO NOTHING;
+    """
+
+
+def _prepare_data_to_insert(rows, insert_index):
+    row_without_last_element = []
+    for row in rows:
+        mapped_row = _map_data(row, insert_index)
+        row_without_last_element.append(tuple(mapped_row.values()))
+        insert_index += 1
+
+    return row_without_last_element
+
+
+def _map_data(row, insert_index):
+    return {
+        "audit_created_by": OATS_ETL_USER,
+        "audit_created_at": to_alcs_format(get_now_with_offset(insert_index)),
+        "email": row["email_address"],
+        "first_name": _get_name(row),
+        "last_name": row["last_name"],
+        "notification_submission_uuid": row["notification_submission_uuid"],
+        "organization_name": _get_organization_name(row),
+        "phone_number": row.get("phone_number", "cell_phone_number"),
+        "type_code": _map_owner_type(row),
+        "oats_alr_application_party_id": row["alr_application_party_id"],
+    }
+
+
+def _get_organization_name(row):
+    organization_name = (row.get("organization_name") or "").strip()
+    alias_name = (row.get("alias_name") or "").strip()
+
+    if not organization_name and not alias_name:
+        return None
+
+    return f"{organization_name} {alias_name}".strip()
+
+
+def _get_name(row):
+    first_name = row.get("first_name", None)
+    middle_name = row.get("middle_name", None)
+
+    return " ".join(
+        [name for name in (first_name, middle_name) if name is not None]
+    ).strip()
+
+
+def _map_owner_type(data):
+    if data["organization_id"]:
+        return ALCSOwnerType.ORGZ.value
+    if data["person_id"]:
+        return ALCSOwnerType.INDV.value
+
+
+@inject_conn_pool
+def clean_transferees(conn=None):
+    logger.info("Start notification transferee cleaning")
+    with conn.cursor() as cursor:
+        cursor.execute(
+            f"DELETE FROM alcs.notification_transferee WHERE audit_created_by = '{OATS_ETL_USER}' AND audit_updated_by IS NULL"
+        )
+        logger.info(f"Deleted items count = {cursor.rowcount}")
+    conn.commit()
+    logger.info("Done notification transferee cleaning")
diff --git a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html
index b08c7e2ddd..8948b82268 100644
--- a/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html
+++ b/portal-frontend/src/app/features/applications/application-details/parcel/parcel.component.html
@@ -103,38 +103,38 @@ <h4>Parcel #{{ parcelInd + 1 }}</h4>
       </div>
 
       <ng-container *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
-        <h5 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government Parcel Contact</h5>
+        <h5>Government Parcel Contact</h5>
         <ng-container *ngIf="parcel.owners[0]">
           <div class="subheading2 grid-1">First Name</div>
           <div class="grid-double">
             {{ parcel.owners[0].firstName }}
             <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].firstName"></app-no-data>
           </div>
-          <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
+          <div class="subheading2 grid-1">
             Last Name
           </div>
           <div class="grid-double">
             {{ parcel.owners[0].lastName }}
             <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].lastName"></app-no-data>
           </div>
-          <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
+          <div class="subheading2 grid-1">
             Ministry or Department
           </div>
           <div class="grid-double">
             {{ parcel.owners[0].organizationName }}
             <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].organizationName"></app-no-data>
           </div>
-          <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Phone</div>
+          <div class="subheading2 grid-1">Phone</div>
           <div class="grid-double">
             {{ parcel.owners[0].phoneNumber ?? '' | mask : '(000) 000-0000' }}
             <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].phoneNumber"></app-no-data>
           </div>
-          <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Email</div>
+          <div class="subheading2 grid-1">Email</div>
           <div class="grid-double">
             {{ parcel.owners[0].email }}
             <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].email"></app-no-data>
           </div>
-          <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
+          <div class="subheading2 grid-1">
             Crown Type
           </div>
           <div class="grid-double">
@@ -148,20 +148,13 @@ <h5 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government
 
       <div
         class="full-width owner-information"
-        [ngClass]="{ 'crown-owner-information': parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN }"
         *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN"
       >
-        <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Land Owner(s)</div>
-        <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
-          Crown Contact(s)
-        </div>
-        <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Organization</div>
-        <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
-          Ministry/Department
-        </div>
+        <div class="subheading2">Land Owner(s)</div>
+        <div class="subheading2">Organization</div>
         <div class="subheading2">Phone</div>
         <div class="subheading2">Email</div>
-        <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">
+        <div class="subheading2">
           Corporate Summary
         </div>
         <ng-container *ngFor="let owner of parcel.owners">
@@ -172,7 +165,7 @@ <h5 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government
           </div>
           <div>{{ owner.phoneNumber ?? '' | mask : '(000) 000-0000' }}</div>
           <div>{{ owner.email }}</div>
-          <div *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">
+          <div>
             <a *ngIf="owner.corporateSummary" (click)="onOpenFile(owner.corporateSummary.uuid)">{{
               owner.corporateSummary.fileName
             }}</a>
diff --git a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html
index 69d0d74c6a..da4cec4313 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html
+++ b/portal-frontend/src/app/features/applications/edit-submission/parcel-details/parcel-entry/parcel-entry.component.html
@@ -357,7 +357,10 @@ <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6>
             </div>
             <div class="row">
               <div class="key"><strong>Crown Type:</strong></div>
-              <div class="value">{{ selectedOwner.crownLandOwnerType }}</div>
+              <div class="value">
+                {{ selectedOwner.crownLandOwnerType === 'provincial' ? 'Provincial Crown' : '' }}
+                {{ selectedOwner.crownLandOwnerType === 'federal' ? 'Federal Crown' : '' }}
+              </div>
             </div>
             <div class="row">
               <button type="button" [disabled]="_disabled" (click)="onEditCrownOwner(selectedOwner)" mat-flat-button>
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.ts
index ad7e9c0fe4..06e0b37caa 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/cove-proposal/cove-proposal.component.ts
@@ -17,6 +17,7 @@ import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'
 import { EditApplicationSteps } from '../../edit-submission.component';
 import { FilesStepComponent } from '../../files-step.partial';
 import { CovenantTransfereeDialogComponent } from './transferee-dialog/transferee-dialog.component';
+import { ConfirmationDialogService } from '../../../../../shared/confirmation-dialog/confirmation-dialog.service';
 
 @Component({
   selector: 'app-cove-proposal',
@@ -52,6 +53,7 @@ export class CoveProposalComponent extends FilesStepComponent implements OnInit,
 
   constructor(
     private covenantTransfereeService: CovenantTransfereeService,
+    private confDialogService: ConfirmationDialogService,
     private applicationSubmissionService: ApplicationSubmissionService,
     applicationDocumentService: ApplicationDocumentService,
     dialog: MatDialog,
@@ -161,8 +163,16 @@ export class CoveProposalComponent extends FilesStepComponent implements OnInit,
   }
 
   async onDelete(uuid: string) {
-    await this.covenantTransfereeService.delete(uuid);
-    await this.loadTransferees(this.submissionUuid);
+    const selectedTransferee = this.transferees.find((transferee) => transferee.uuid === uuid);
+    this.confDialogService
+      .openDialog({
+        title: 'Remove Transferee',
+        body: `This action will remove ${selectedTransferee?.firstName} ${selectedTransferee?.lastName} and its usage from the entire Application. Are you sure you want to remove this transferee? `,
+      })
+      .subscribe(async (confirmed) => {
+        await this.covenantTransfereeService.delete(uuid);
+        await this.loadTransferees(this.submissionUuid);
+      });
   }
 
   onChangeHasDraftCopy(value: string) {
diff --git a/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html
index f975172d3c..e9af24188d 100644
--- a/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html
+++ b/portal-frontend/src/app/features/create-submission-dialog/create-submission-dialog.component.html
@@ -34,14 +34,14 @@ <h4 *ngIf="currentStep === steps.prescribedBody">
             [innerHtml]="selectedSubmissionType.portalHtmlDescription"
           ></div>
         </div>
+        <span
+          class="read-more-btn"
+          [ngClass]="{ 'display-none': !isReadMoreVisible }"
+          *ngIf="selectedSubmissionType"
+          (click)="onReadMoreClicked()"
+          ><u>Read {{ readMoreClicked ? 'Less' : 'More' }}</u></span
+        >
       </div>
-      <span
-        class="read-more-btn"
-        [ngClass]="{ 'display-none': !isReadMoreVisible }"
-        *ngIf="selectedSubmissionType"
-        (click)="onReadMoreClicked()"
-        ><u>Read {{ readMoreClicked ? 'Less' : 'More' }}</u></span
-      >
     </ng-container>
     <ng-container *ngIf="currentStep === steps.applicationType">
       <div class="subheading2 step-description">Select an option to learn more about the application type.</div>
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html
index 9c50285e2f..0ec0f65047 100644
--- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html
+++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.html
@@ -353,7 +353,10 @@ <h6 class="owner-search-option" *ngIf="filteredOwners.length">OR</h6>
             </div>
             <div class="row">
               <div class="key"><strong>Crown Type:</strong></div>
-              <div class="value">{{ selectedOwner.crownLandOwnerType }}</div>
+              <div class="value">
+                {{ selectedOwner.crownLandOwnerType === 'provincial' ? 'Provincial Crown' : '' }}
+                {{ selectedOwner.crownLandOwnerType === 'federal' ? 'Federal Crown' : '' }}
+              </div>
             </div>
             <div class="row">
               <button type="button" (click)="onEditCrownOwner(selectedOwner)" mat-flat-button>Edit information</button>
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html
index 51ee4bc69e..6b8472096d 100644
--- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html
+++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/proposal/pfrs/pfrs-proposal.component.html
@@ -166,9 +166,9 @@ <h2>Proposal</h2>
         >
           <mat-icon>warning</mat-icon>
           <div *ngIf="fillProjectDuration.errors?.['required']">This field is required</div>
-          <div class="subtext">Characters left: {{ 500 - (fillProjectDuration.value || '').length }}</div>
         </div>
         <mat-hint class="subtext">Example: 30 years; or 3 months; or 5 days</mat-hint>
+        <div class="subtext">Characters left: {{ 500 - (fillProjectDuration.value || '').length }}</div>
       </div>
       <div>
         <label for="soilProjectDuration">Removal of Soil Project Duration</label>
@@ -188,9 +188,9 @@ <h2>Proposal</h2>
         >
           <mat-icon>warning</mat-icon>
           <div *ngIf="soilProjectDuration.errors?.['required']">This field is required</div>
-          <div class="subtext">Characters left: {{ 500 - (soilProjectDuration.value || '').length }}</div>
         </div>
         <mat-hint class="subtext">Example: 30 years; or 3 months; or 5 days</mat-hint>
+        <div class="subtext">Characters left: {{ 500 - (soilProjectDuration.value || '').length }}</div>
       </div>
     </div>
 
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.ts
index 7c378d718c..b171e3b972 100644
--- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.ts
+++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/review-and-submit/review-and-submit.component.ts
@@ -57,7 +57,7 @@ export class ReviewAndSubmitComponent extends StepComponent implements OnInit, O
 
   async onDownloadPdf(fileNumber: string | undefined) {
     if (fileNumber) {
-      await this.pdfGenerationService.generateAppSubmission(fileNumber);
+      await this.pdfGenerationService.generateNoiSubmission(fileNumber);
     }
   }
 }
diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html
index fc52248c8a..32bcc16494 100644
--- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html
+++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html
@@ -103,38 +103,38 @@ <h4>Parcel #{{ parcelInd + 1 }}</h4>
       </div>
 
       <ng-container *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
-        <h5 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government Parcel Contact</h5>
+        <h5>Government Parcel Contact</h5>
         <ng-container *ngIf="parcel.owners[0]">
           <div class="subheading2 grid-1">First Name</div>
           <div class="grid-double">
             {{ parcel.owners[0].firstName }}
             <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].firstName"></app-no-data>
           </div>
-          <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
+          <div class="subheading2 grid-1">
             Last Name
           </div>
           <div class="grid-double">
             {{ parcel.owners[0].lastName }}
             <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].lastName"></app-no-data>
           </div>
-          <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
+          <div class="subheading2 grid-1">
             Ministry or Department
           </div>
           <div class="grid-double">
             {{ parcel.owners[0].organizationName }}
             <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].organizationName"></app-no-data>
           </div>
-          <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Phone</div>
+          <div class="subheading2 grid-1">Phone</div>
           <div class="grid-double">
             {{ parcel.owners[0].phoneNumber ?? '' | mask : '(000) 000-0000' }}
             <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].phoneNumber"></app-no-data>
           </div>
-          <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Email</div>
+          <div class="subheading2 grid-1">Email</div>
           <div class="grid-double">
             {{ parcel.owners[0].email }}
             <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].email"></app-no-data>
           </div>
-          <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
+          <div class="subheading2 grid-1">
             Crown Type
           </div>
           <div class="grid-double">
@@ -148,20 +148,13 @@ <h5 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government
 
       <div
         class="full-width owner-information"
-        [ngClass]="{ 'crown-owner-information': parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN }"
         *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN"
       >
-        <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Land Owner(s)</div>
-        <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
-          Crown Contact(s)
-        </div>
-        <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Organization</div>
-        <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
-          Ministry/Department
-        </div>
+        <div class="subheading2">Land Owner(s)</div>
+        <div class="subheading2">Organization</div>
         <div class="subheading2">Phone</div>
         <div class="subheading2">Email</div>
-        <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">
+        <div class="subheading2">
           Corporate Summary
         </div>
         <ng-container *ngFor="let owner of parcel.owners">
@@ -172,7 +165,7 @@ <h5 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government
           </div>
           <div>{{ owner.phoneNumber ?? '' | mask : '(000) 000-0000' }}</div>
           <div>{{ owner.email }}</div>
-          <div *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">
+          <div>
             <a *ngIf="owner.corporateSummary" (click)="onOpenFile(owner.corporateSummary.uuid)">{{
               owner.corporateSummary.fileName
             }}</a>
diff --git a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.ts b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.ts
index 127efe6a11..0ec050870c 100644
--- a/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.ts
+++ b/portal-frontend/src/app/features/notifications/edit-submission/transferees/transferees.component.ts
@@ -8,6 +8,7 @@ import { NotificationTransfereeService } from '../../../../services/notification
 import { EditNotificationSteps } from '../edit-submission.component';
 import { StepComponent } from '../step.partial';
 import { TransfereeDialogComponent } from './transferee-dialog/transferee-dialog.component';
+import { ConfirmationDialogService } from '../../../../shared/confirmation-dialog/confirmation-dialog.service';
 
 @Component({
   selector: 'app-transferees',
@@ -27,6 +28,7 @@ export class TransfereesComponent extends StepComponent implements OnInit, OnDes
     private router: Router,
     private notificationTransfereeService: NotificationTransfereeService,
     private notificationSubmissionService: NotificationSubmissionService,
+    private confDialogService: ConfirmationDialogService,
     private dialog: MatDialog
   ) {
     super();
@@ -86,7 +88,15 @@ export class TransfereesComponent extends StepComponent implements OnInit, OnDes
   }
 
   async onDelete(uuid: string) {
-    await this.notificationTransfereeService.delete(uuid);
-    await this.loadTransferees(this.submissionUuid);
+    const selectedTransferee = this.transferees.find((transferee) => transferee.uuid === uuid);
+    this.confDialogService
+      .openDialog({
+        title: 'Remove Transferee',
+        body: `This action will remove ${selectedTransferee?.firstName} ${selectedTransferee?.lastName} and its usage from the entire notification of SRW. Are you sure you want to remove this transferee? `,
+      })
+      .subscribe(async (confirmed) => {
+        await this.notificationTransfereeService.delete(uuid);
+        await this.loadTransferees(this.submissionUuid);
+      });
   }
 }
diff --git a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html
index b5ea5e4cfa..82c0744394 100644
--- a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html
+++ b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html
@@ -58,12 +58,42 @@ <h4>Parcel #{{ parcelInd + 1 }}</h4>
         <app-no-data *ngIf="parcel.crownLandOwnerType === null"></app-no-data>
       </div>
     </ng-container>
-    <div class="full-width owner-information">
+    <ng-container *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
+      <h5>Government Parcel Contact</h5>
+      <ng-container *ngIf="parcel.owners[0]">
+        <div class="subheading2 grid-1">First Name</div>
+        <div class="grid-double">
+          {{ parcel.owners[0].firstName }}
+          <app-no-data *ngIf="!parcel.owners[0].firstName"></app-no-data>
+        </div>
+        <div class="subheading2 grid-1">
+          Last Name
+        </div>
+        <div class="grid-double">
+          {{ parcel.owners[0].lastName }}
+          <app-no-data *ngIf="!parcel.owners[0].lastName"></app-no-data>
+        </div>
+        <div class="subheading2 grid-1">
+          Ministry or Department
+        </div>
+        <div class="grid-double">
+          {{ parcel.owners[0].organizationName }}
+          <app-no-data *ngIf="!parcel.owners[0].organizationName"></app-no-data>
+        </div>
+        <div class="subheading2 grid-1">
+          Crown Type
+        </div>
+        <div class="grid-double">
+          {{ parcel.owners[0].crownLandOwnerType === 'provincial' ? 'Provincial Crown' : '' }}
+          {{ parcel.owners[0].crownLandOwnerType === 'federal' ? 'Federal Crown' : '' }}
+          <app-no-data *ngIf="!parcel.owners[0].crownLandOwnerType"></app-no-data>
+        </div>
+      </ng-container>
+      <app-no-data *ngIf="!parcel.owners[0]"></app-no-data>
+    </ng-container>
+    <div class="full-width owner-information" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">
       <div class="subheading2">Land Owner(s)</div>
-      <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Organization</div>
-      <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
-        Ministry or Department
-      </div>
+      <div class="subheading2">Organization</div>
       <ng-container *ngFor="let owner of parcel.owners">
         <div>{{ owner.displayName }}</div>
         <div>
diff --git a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html
index 7cefe5f8ef..d532fd963d 100644
--- a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html
+++ b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html
@@ -28,7 +28,7 @@
     </div>
     <app-no-data *ngIf="!applicationSubmission.soilProjectDuration"></app-no-data>
   </div>
-  
+
   <div class="full-width soil-table">
     <div></div>
     <div class="subheading2">Soil to be Removed</div>
@@ -37,32 +37,28 @@
     <div>
       {{ applicationSubmission.soilToRemoveVolume }}
       <span *ngIf="applicationSubmission.soilToRemoveVolume !== null">m<sup>3</sup></span>
-      <app-no-data [*ngIf="applicationSubmission.soilToRemoveVolume === null"></app-no-data>
+      <app-no-data *ngIf="applicationSubmission.soilToRemoveVolume === null"></app-no-data>
     </div>
 
     <div class="subheading2">Area</div>
     <div>
       {{ applicationSubmission.soilToRemoveArea }}
       <span *ngIf="applicationSubmission.soilToRemoveArea !== null">m<sup>2</sup></span>
-      <app-no-data [*ngIf="applicationSubmission.soilToRemoveArea === null"></app-no-data>
+      <app-no-data *ngIf="applicationSubmission.soilToRemoveArea === null"></app-no-data>
     </div>
 
     <div class="subheading2">Maximum Depth</div>
     <div>
       {{ applicationSubmission.soilToRemoveMaximumDepth }}
       <span *ngIf="applicationSubmission.soilToRemoveMaximumDepth !== null">m</span>
-      <app-no-data
-        *ngIf="applicationSubmission.soilToRemoveMaximumDepth === null"
-      ></app-no-data>
+      <app-no-data *ngIf="applicationSubmission.soilToRemoveMaximumDepth === null"></app-no-data>
     </div>
 
     <div class="subheading2">Average Depth</div>
     <div>
       {{ applicationSubmission.soilToRemoveAverageDepth }}
       <span *ngIf="applicationSubmission.soilToRemoveAverageDepth !== null">m</span>
-      <app-no-data
-        *ngIf="applicationSubmission.soilToRemoveAverageDepth === null"
-      ></app-no-data>
+      <app-no-data *ngIf="applicationSubmission.soilToRemoveAverageDepth === null"></app-no-data>
     </div>
 
     <div></div>
@@ -72,36 +68,28 @@
     <div>
       {{ applicationSubmission.soilAlreadyRemovedVolume }}
       <span *ngIf="applicationSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span>
-      <app-no-data
-        *ngIf="applicationSubmission.soilAlreadyRemovedVolume === null"
-      ></app-no-data>
+      <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedVolume === null"></app-no-data>
     </div>
 
     <div class="subheading2">Area</div>
     <div>
       {{ applicationSubmission.soilAlreadyRemovedArea }}
       <span *ngIf="applicationSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span>
-      <app-no-data
-        *ngIf="applicationSubmission.soilAlreadyRemovedArea === null"
-      ></app-no-data>
+      <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedArea === null"></app-no-data>
     </div>
 
     <div class="subheading2">Maximum Depth</div>
     <div>
       {{ applicationSubmission.soilAlreadyRemovedMaximumDepth }}
       <span *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth !== null">m</span>
-      <app-no-data
-        *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth === null"
-      ></app-no-data>
+      <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedMaximumDepth === null"></app-no-data>
     </div>
 
     <div class="subheading2">Average Depth</div>
     <div>
       {{ applicationSubmission.soilAlreadyRemovedAverageDepth }}
       <span *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth !== null">m</span>
-      <app-no-data
-        *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth === null"
-      ></app-no-data>
+      <app-no-data *ngIf="applicationSubmission.soilAlreadyRemovedAverageDepth === null"></app-no-data>
     </div>
   </div>
 
diff --git a/portal-frontend/src/app/features/public/application/submission/submission-details.component.html b/portal-frontend/src/app/features/public/application/submission/submission-details.component.html
index f963c4e837..e1fd3f6dd8 100644
--- a/portal-frontend/src/app/features/public/application/submission/submission-details.component.html
+++ b/portal-frontend/src/app/features/public/application/submission/submission-details.component.html
@@ -161,6 +161,6 @@ <h3>Proposal</h3>
     *ngIf="applicationSubmission.typeCode === 'COVE'"
     [applicationSubmission]="applicationSubmission"
     [applicationDocuments]="applicationDocuments"
-    [transferees]='transferees'
+    [transferees]="transferees"
   ></app-cove-details>
 </section>
diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html
index 711c0dbd86..55c7b721c4 100644
--- a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html
+++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html
@@ -58,12 +58,42 @@ <h4>Parcel #{{ parcelInd + 1 }}</h4>
         <app-no-data *ngIf="parcel.crownLandOwnerType === null"></app-no-data>
       </div>
     </ng-container>
-    <div class="full-width owner-information">
+    <ng-container *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
+      <h5>Government Parcel Contact</h5>
+      <ng-container *ngIf="parcel.owners[0]">
+        <div class="subheading2 grid-1">First Name</div>
+        <div class="grid-double">
+          {{ parcel.owners[0].firstName }}
+          <app-no-data *ngIf="!parcel.owners[0].firstName"></app-no-data>
+        </div>
+        <div class="subheading2 grid-1">
+          Last Name
+        </div>
+        <div class="grid-double">
+          {{ parcel.owners[0].lastName }}
+          <app-no-data *ngIf="!parcel.owners[0].lastName"></app-no-data>
+        </div>
+        <div class="subheading2 grid-1">
+          Ministry or Department
+        </div>
+        <div class="grid-double">
+          {{ parcel.owners[0].organizationName }}
+          <app-no-data *ngIf="!parcel.owners[0].organizationName"></app-no-data>
+        </div>
+        <div class="subheading2 grid-1">
+          Crown Type
+        </div>
+        <div class="grid-double">
+          {{ parcel.owners[0].crownLandOwnerType === 'provincial' ? 'Provincial Crown' : '' }}
+          {{ parcel.owners[0].crownLandOwnerType === 'federal' ? 'Federal Crown' : '' }}
+          <app-no-data *ngIf="!parcel.owners[0].crownLandOwnerType"></app-no-data>
+        </div>
+      </ng-container>
+      <app-no-data *ngIf="!parcel.owners[0]"></app-no-data>
+    </ng-container>
+    <div class="full-width owner-information" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">
       <div class="subheading2">Land Owner(s)</div>
-      <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Organization</div>
-      <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
-        Ministry or Department
-      </div>
+      <div class="subheading2">Organization</div>
       <ng-container *ngFor="let owner of parcel.owners">
         <div>{{ owner.displayName }}</div>
         <div>
diff --git a/portal-frontend/src/app/services/public/public.dto.ts b/portal-frontend/src/app/services/public/public.dto.ts
index edb3eda78a..7c5a859fd8 100644
--- a/portal-frontend/src/app/services/public/public.dto.ts
+++ b/portal-frontend/src/app/services/public/public.dto.ts
@@ -8,6 +8,7 @@ export interface PublicOwnerDto {
   firstName?: string | null;
   lastName?: string | null;
   organizationName?: string | null;
+  crownLandOwnerType?: string | null;
   type: OwnerTypeDto;
 }
 
diff --git a/portal-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.service.ts b/portal-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.service.ts
index 7beca80b4f..52f415f100 100644
--- a/portal-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.service.ts
+++ b/portal-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.service.ts
@@ -12,6 +12,7 @@ export class ConfirmationDialogService {
     const result = new EventEmitter<boolean>();
     const dialogRef = this.dialog.open(ConfirmationDialogComponent, {
       data,
+      autoFocus: false,
     });
 
     dialogRef.afterClosed().subscribe((response) => {
diff --git a/portal-frontend/src/app/shared/prescribed-body/prescribed-body.component.ts b/portal-frontend/src/app/shared/prescribed-body/prescribed-body.component.ts
index 2f07b40fdc..ff3623f4ac 100644
--- a/portal-frontend/src/app/shared/prescribed-body/prescribed-body.component.ts
+++ b/portal-frontend/src/app/shared/prescribed-body/prescribed-body.component.ts
@@ -1,5 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { AuthenticationService } from '../../services/authentication/authentication.service';
+import { scrollToElement } from '../utils/scroll-helper';
 
 const FIRST_NATION = 'First Nation Government';
 const LOCAL = 'Local Government';
@@ -65,6 +66,17 @@ export class PrescribedBodyComponent implements OnInit {
   }
 
   onSelect(chosenValue: string) {
+    setTimeout(() => {
+      const element = document.getElementsByClassName('warning-banner');
+      if (element.length > 0) {
+        element[0].scrollIntoView({
+          behavior: 'smooth',
+          inline: 'center',
+          block: 'center',
+        });
+      }
+    }, 300);
+
     this.selectedValue = chosenValue;
     if (
       (chosenValue === LOCAL && !this.isLocalGovernmentUser) ||
diff --git a/portal-frontend/src/app/shared/validation-error/validation-error.component.scss b/portal-frontend/src/app/shared/validation-error/validation-error.component.scss
index f301653c1d..8391a0f1b4 100644
--- a/portal-frontend/src/app/shared/validation-error/validation-error.component.scss
+++ b/portal-frontend/src/app/shared/validation-error/validation-error.component.scss
@@ -4,6 +4,8 @@
 .error {
   margin-top: rem(4);
   color: colors.$error-color;
+  font-size: rem(15);
+  font-weight: 700;
   display: flex;
   align-items: center;
 
diff --git a/services/apps/alcs/src/alcs/application-decision/application-boundary-amendment/application-boundary-amendment.entity.ts b/services/apps/alcs/src/alcs/application-decision/application-boundary-amendment/application-boundary-amendment.entity.ts
index 175fb95031..56fa3b4a12 100644
--- a/services/apps/alcs/src/alcs/application-decision/application-boundary-amendment/application-boundary-amendment.entity.ts
+++ b/services/apps/alcs/src/alcs/application-decision/application-boundary-amendment/application-boundary-amendment.entity.ts
@@ -52,6 +52,15 @@ export class ApplicationBoundaryAmendment extends Base {
   })
   period: number;
 
+  @Column({
+    select: false,
+    nullable: true,
+    type: 'int8',
+    comment:
+      'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_alr_appl_components to alcs.application_boundary_condition.',
+  })
+  oatsComponentId: number;
+
   @ManyToMany(() => ApplicationDecisionComponent)
   @JoinTable({
     name: 'application_boundary_amendments_to_components',
diff --git a/services/apps/alcs/src/alcs/import/application-import.service.spec.ts b/services/apps/alcs/src/alcs/import/application-import.service.spec.ts
index 7205be8798..b22592ecee 100644
--- a/services/apps/alcs/src/alcs/import/application-import.service.spec.ts
+++ b/services/apps/alcs/src/alcs/import/application-import.service.spec.ts
@@ -3,19 +3,19 @@ import { Test, TestingModule } from '@nestjs/testing';
 import * as dayjs from 'dayjs';
 import * as timezone from 'dayjs/plugin/timezone';
 import * as utc from 'dayjs/plugin/utc';
-import { Volume, fs } from 'memfs';
+import { Volume } from 'memfs';
 import * as path from 'path';
-import { LocalGovernment } from '../local-government/local-government.entity';
-import { LocalGovernmentService } from '../local-government/local-government.service';
+import { initApplicationMockEntity } from '../../../test/mocks/mockEntities';
 import { ApplicationMeeting } from '../application/application-meeting/application-meeting.entity';
 import { ApplicationMeetingService } from '../application/application-meeting/application-meeting.service';
 import { ApplicationPaused } from '../application/application-paused.entity';
 import { ApplicationPausedService } from '../application/application-paused/application-paused.service';
-import { Application } from '../application/application.entity';
+import { ApplicationSubmissionStatusService } from '../application/application-submission-status/application-submission-status.service';
 import { ApplicationService } from '../application/application.service';
 import { BoardService } from '../board/board.service';
 import { Card } from '../card/card.entity';
-import { initApplicationMockEntity } from '../../../test/mocks/mockEntities';
+import { LocalGovernment } from '../local-government/local-government.entity';
+import { LocalGovernmentService } from '../local-government/local-government.service';
 import { ApplicationImportService } from './application-import.service';
 
 dayjs.extend(utc);
@@ -35,6 +35,7 @@ describe('ImportService', () => {
   let mockPausedService: DeepMocked<ApplicationPausedService>;
   let mockLocalGovernmentService: DeepMocked<LocalGovernmentService>;
   let mockBoardService: DeepMocked<BoardService>;
+  let mockApplicationSubmissionStatusService: DeepMocked<ApplicationSubmissionStatusService>;
 
   let mockDataRow;
   let mockApplication;
@@ -42,11 +43,12 @@ describe('ImportService', () => {
   beforeEach(async () => {
     jest.resetAllMocks();
 
-    mockApplicationservice = createMock<ApplicationService>();
-    mockApplicationMeetingService = createMock<ApplicationMeetingService>();
-    mockPausedService = createMock<ApplicationPausedService>();
-    mockLocalGovernmentService = createMock<LocalGovernmentService>();
-    mockBoardService = createMock<BoardService>();
+    mockApplicationservice = createMock();
+    mockApplicationMeetingService = createMock();
+    mockPausedService = createMock();
+    mockLocalGovernmentService = createMock();
+    mockBoardService = createMock();
+    mockApplicationSubmissionStatusService = createMock();
 
     const module: TestingModule = await Test.createTestingModule({
       providers: [
@@ -71,6 +73,10 @@ describe('ImportService', () => {
           provide: BoardService,
           useValue: mockBoardService,
         },
+        {
+          provide: ApplicationSubmissionStatusService,
+          useValue: mockApplicationSubmissionStatusService,
+        },
       ],
     }).compile();
 
@@ -84,10 +90,13 @@ describe('ImportService', () => {
       Region: 'fake-region',
     };
 
-    mockApplicationservice.get.mockResolvedValue(null);
     mockApplication = initApplicationMockEntity(mockDataRow['App ID']);
+    mockApplicationservice.get.mockResolvedValue(mockApplication);
     mockApplicationservice.create.mockResolvedValue(mockApplication);
     mockApplicationservice.update.mockResolvedValue(mockApplication);
+    mockApplicationSubmissionStatusService.setStatusDateByFileNumber.mockResolvedValue(
+      {} as any,
+    );
 
     mockLocalGovernmentService.getByName.mockResolvedValue({
       uuid: 'government-uuid',
@@ -116,108 +125,7 @@ describe('ImportService', () => {
 
     await service.importCsv();
 
-    expect(mockApplicationservice.create).toHaveBeenCalledTimes(1);
-    expect(mockApplicationservice.create).toHaveBeenCalledWith({
-      applicant: 'Imported',
-      dateSubmittedToAlc: dayjs('2022-05-08')
-        .tz('Canada/Pacific')
-        .startOf('day')
-        .toDate(),
-      fileNumber: '51231',
-      localGovernmentUuid: 'government-uuid',
-      regionCode: undefined,
-      typeCode: 'PFRS',
-    });
-  });
-
-  it('should do nothing if the file already exists', async () => {
-    mockApplicationservice.get.mockResolvedValue({} as Application);
-
-    await service.parseRow(mockDataRow, new Map());
-
-    expect(mockApplicationservice.get).toHaveBeenCalledTimes(1);
-    expect(mockApplicationservice.create).toHaveBeenCalledTimes(0);
-  });
-
-  it('should do nothing if there is no mapping data', async () => {
-    await service.parseRow(mockDataRow, new Map());
-
-    expect(mockApplicationservice.get).toHaveBeenCalledTimes(1);
-    expect(mockApplicationservice.create).toHaveBeenCalledTimes(0);
-  });
-
-  it('should create a new application if the file does not exist', async () => {
-    await service.parseRow(
-      mockDataRow,
-      new Map([
-        [
-          mockApplication.fileNumber,
-          {
-            type: 'SDV',
-            localGovernment: 'lg',
-          },
-        ],
-      ]),
-    );
-
-    expect(mockApplicationservice.get).toHaveBeenCalledTimes(1);
-    expect(mockApplicationservice.create).toHaveBeenCalledTimes(1);
-  });
-
-  it('should should do a fallback search for local government', async () => {
-    mockLocalGovernmentService.getByName.mockResolvedValueOnce(null);
-    mockLocalGovernmentService.getByName.mockResolvedValueOnce(
-      {} as LocalGovernment,
-    );
-    await service.parseRow(
-      mockDataRow,
-      new Map([
-        [
-          mockApplication.fileNumber,
-          {
-            type: 'SDV',
-            localGovernment: 'lg',
-          },
-        ],
-      ]),
-    );
-
-    expect(mockApplicationservice.get).toHaveBeenCalledTimes(1);
-    expect(mockApplicationservice.create).toHaveBeenCalledTimes(1);
-    expect(mockLocalGovernmentService.getByName).toHaveBeenCalledTimes(2);
-    expect(mockLocalGovernmentService.getByName).toHaveBeenCalledWith('lg');
-    expect(mockLocalGovernmentService.getByName).toHaveBeenCalledWith(
-      'lg Regional District',
-    );
-  });
-
-  it('should change the board if the row is ackComplete', async () => {
-    const dataRowWithAckComplete = {
-      ...mockDataRow,
-      'Ack by ALC': new Date(),
-    };
-    mockBoardService.changeBoard.mockResolvedValue({} as Card);
-
-    await service.parseRow(
-      dataRowWithAckComplete,
-      new Map([
-        [
-          mockApplication.fileNumber,
-          {
-            type: 'SDV',
-            localGovernment: 'lg',
-          },
-        ],
-      ]),
-    );
-
-    expect(mockApplicationservice.get).toHaveBeenCalledTimes(1);
-    expect(mockApplicationservice.create).toHaveBeenCalledTimes(1);
-    expect(mockBoardService.changeBoard).toHaveBeenCalledTimes(1);
-    expect(mockBoardService.changeBoard).toHaveBeenCalledWith(
-      mockApplication.cardUuid,
-      'exec',
-    );
+    expect(mockApplicationservice.update).toHaveBeenCalledTimes(1);
   });
 
   it('should create a meeting and a pause for row with request date', async () => {
@@ -231,21 +139,9 @@ describe('ImportService', () => {
       {} as ApplicationMeeting,
     );
 
-    await service.parseRow(
-      dataRowWithRequests,
-      new Map([
-        [
-          mockApplication.fileNumber,
-          {
-            type: 'SDV',
-            localGovernment: 'lg',
-          },
-        ],
-      ]),
-    );
+    await service.parseRow(dataRowWithRequests);
 
     expect(mockApplicationservice.get).toHaveBeenCalledTimes(1);
-    expect(mockApplicationservice.create).toHaveBeenCalledTimes(1);
     expect(mockPausedService.createOrUpdate).toHaveBeenCalledTimes(1);
     expect(mockApplicationMeetingService.create).toHaveBeenCalledTimes(1);
   });
@@ -263,21 +159,9 @@ describe('ImportService', () => {
       {} as ApplicationMeeting,
     );
 
-    await service.parseRow(
-      dataRowWithRequests,
-      new Map([
-        [
-          mockApplication.fileNumber,
-          {
-            type: 'SDV',
-            localGovernment: 'lg',
-          },
-        ],
-      ]),
-    );
+    await service.parseRow(dataRowWithRequests);
 
     expect(mockApplicationservice.get).toHaveBeenCalledTimes(1);
-    expect(mockApplicationservice.create).toHaveBeenCalledTimes(1);
     expect(mockPausedService.createOrUpdate).toHaveBeenCalledTimes(2);
     expect(mockApplicationMeetingService.create).toHaveBeenCalledTimes(1);
   });
diff --git a/services/apps/alcs/src/alcs/import/application-import.service.ts b/services/apps/alcs/src/alcs/import/application-import.service.ts
index 93039630a0..4cdc654a56 100644
--- a/services/apps/alcs/src/alcs/import/application-import.service.ts
+++ b/services/apps/alcs/src/alcs/import/application-import.service.ts
@@ -5,13 +5,12 @@ import * as timezone from 'dayjs/plugin/timezone';
 import * as utc from 'dayjs/plugin/utc';
 import * as fs from 'fs';
 import * as path from 'path';
-import { LocalGovernmentService } from '../local-government/local-government.service';
 import { ApplicationMeetingService } from '../application/application-meeting/application-meeting.service';
 import { ApplicationPausedService } from '../application/application-paused/application-paused.service';
+import { ApplicationSubmissionStatusService } from '../application/application-submission-status/application-submission-status.service';
+import { SUBMISSION_STATUS } from '../application/application-submission-status/submission-status.dto';
 import { Application } from '../application/application.entity';
 import { ApplicationService } from '../application/application.service';
-import { BOARD_CODES } from '../board/board.dto';
-import { BoardService } from '../board/board.service';
 
 dayjs.extend(utc);
 dayjs.extend(timezone);
@@ -47,44 +46,6 @@ export type ApplicationRow = {
   region: string;
 };
 
-const REGION_CODE_MAP = {
-  Interior: 'INTR',
-  North: 'NORR',
-  Island: 'ISLR',
-  Kootenay: 'KOOR',
-  Okanagan: 'OKAR',
-  'South Coast': 'SOUR',
-};
-
-const DECISION_MAKER_BOARD_MAP = {
-  'Soil/Fill Panel': BOARD_CODES.SOIL,
-  'CEO Delegated': BOARD_CODES.CEO,
-  Executive: BOARD_CODES.EXECUTIVE_COMMITTEE,
-};
-
-const REGION_BOARD_MAP = {
-  Interior: 'inte',
-  North: 'north',
-  Island: 'island',
-  Kootenay: 'koot',
-  Okanagan: 'okan',
-  'South Coast': 'south',
-};
-
-const TYPE_MAPPING = {
-  INC: 'INCL',
-  SDV: 'SUBD',
-  EXC: 'EXCL',
-  NFU: 'NFUP',
-  TUR: 'TURP',
-  NAR: 'NARU',
-  FILL: 'POFO',
-  EXT: 'ROSO',
-  SCH: 'PFRS',
-  CSC: '',
-  SRW: '',
-};
-
 @Injectable()
 export class ApplicationImportService {
   private logger: Logger = new Logger(ApplicationImportService.name);
@@ -93,29 +54,20 @@ export class ApplicationImportService {
     private applicationService: ApplicationService,
     private meetingService: ApplicationMeetingService,
     private pausedService: ApplicationPausedService,
-    private boardService: BoardService,
-    private localGovernmentService: LocalGovernmentService,
+    private applicationSubmissionStatusService: ApplicationSubmissionStatusService,
   ) {}
 
   importCsv() {
     this.logger.log('Import Setup Started');
     return new Promise(async (resolve) => {
-      const mapping = await this.loadMappingSheet();
-
       const filePath = path.resolve(__dirname, '..', 'Tracking_Sheet.csv');
       const stream = fs.createReadStream(filePath);
       const processing: Promise<any>[] = [];
-      let i = 0;
       stream
         .pipe(csv())
         .on('data', (data) => {
-          if (data['Decision Released (Active)']) {
-            return;
-          }
-
-          const promise = this.parseRow(data, mapping);
+          const promise = this.parseRow(data);
           processing.push(promise);
-          i++;
         })
         .on('end', () => {
           Promise.all(processing).then(() => {
@@ -126,81 +78,29 @@ export class ApplicationImportService {
     });
   }
 
-  async parseRow(
-    data: ApplicationRow,
-    mapping: Map<string, { localGovernment: string; type: string }>,
-  ): Promise<void> {
+  async parseRow(data: ApplicationRow): Promise<void> {
     const mappedRow = this.mapRow(data);
     const existingApplication = await this.applicationService.get(
       mappedRow.fileNumber,
     );
     if (existingApplication) {
-      this.logger.debug(`${mappedRow.fileNumber}: Application already exists`);
-    } else {
-      try {
-        const sheetType = mapping.get(mappedRow.fileNumber);
-        if (!sheetType) {
-          this.logger.warn(`${mappedRow.fileNumber}: Not in mapping sheet`);
-          return;
-        }
-
-        const mappedType = TYPE_MAPPING[sheetType.type];
-        if (!mappedType) {
-          this.logger.warn(
-            `${mappedRow.fileNumber}: Non-importable type ${sheetType.type}`,
-          );
-          return;
-        }
-
-        let localGovernment = await this.localGovernmentService.getByName(
-          sheetType.localGovernment,
-        );
-        if (!localGovernment) {
-          localGovernment = await this.localGovernmentService.getByName(
-            `${sheetType.localGovernment} Regional District`,
-          );
-          if (!localGovernment) {
-            this.logger.error(
-              `${mappedRow.fileNumber}: Failed to load government ${sheetType.localGovernment}`,
-            );
-            return;
-          }
-        }
-
-        const application = await this.applicationService.create({
-          fileNumber: mappedRow.fileNumber,
-          applicant: mappedRow.applicant || 'Imported',
-          dateSubmittedToAlc: mappedRow.submittedToAlc,
-          localGovernmentUuid: localGovernment.uuid,
-          regionCode: REGION_CODE_MAP[mappedRow.region] || undefined,
-          typeCode: mappedType,
-        });
-
-        //Set Payment / ACK Dates
-        const updatedApp = await this.applicationService.update(application, {
-          feePaidDate: mappedRow.feeReceived,
-          dateAcknowledgedIncomplete: mappedRow.ackDeficient,
+      const updatedApp = await this.applicationService.update(
+        existingApplication,
+        {
           dateReceivedAllItems: mappedRow.ackAllComplete,
           dateAcknowledgedComplete: mappedRow.ackComplete,
-        });
+        },
+      );
 
-        await this.createMeetings(mappedRow, updatedApp);
+      await this.applicationSubmissionStatusService.setStatusDateByFileNumber(
+        existingApplication.fileNumber,
+        SUBMISSION_STATUS.RECEIVED_BY_ALC,
+        mappedRow.ackAllComplete,
+      );
 
-        if (mappedRow.ackComplete) {
-          if (
-            mappedRow.decisionMaker === 'Regional Panel' ||
-            mappedRow.decisionMaker === ''
-          ) {
-            const boardCode = REGION_BOARD_MAP[mappedRow.region];
-            await this.boardService.changeBoard(updatedApp.cardUuid, boardCode);
-          } else if (mappedRow.decisionMaker) {
-            const boardCode = DECISION_MAKER_BOARD_MAP[mappedRow.decisionMaker];
-            await this.boardService.changeBoard(updatedApp.cardUuid, boardCode);
-          }
-        }
-      } catch (e) {
-        this.logger.error(`${mappedRow.fileNumber}: ${e.message}`);
-      }
+      await this.createMeetings(mappedRow, updatedApp);
+    } else {
+      this.logger.error(`${mappedRow.fileNumber}: Application does not exist`);
     }
   }
 
@@ -295,47 +195,6 @@ export class ApplicationImportService {
     }
   }
 
-  private loadMappingSheet(): Promise<
-    Map<
-      string,
-      {
-        localGovernment: string;
-        type: string;
-      }
-    >
-  > {
-    const mapping = new Map<
-      string,
-      {
-        localGovernment: string;
-        type: string;
-      }
-    >();
-    const filePath = path.resolve(__dirname, '..', 'App_Listing.csv');
-    const stream = fs.createReadStream(filePath);
-    let i = 0;
-    return new Promise((resolve) => {
-      stream
-        .pipe(csv())
-        .on('data', (data) => {
-          i++;
-          // const appId = data['App ID'];
-          // this is the fix to get the 'App ID' from csv, for some reason specifying 'App ID' did not work even though it is the same in Object.keys(data)[0]
-          const appId = data[Object.keys(data)[0]];
-          const type = data['Type'];
-          const localGovernment = data['Local Gov'];
-          mapping.set(appId, {
-            localGovernment,
-            type,
-          });
-        })
-        .on('end', () => {
-          this.logger.log(`Processed ${i} Mapping Records`);
-          resolve(mapping);
-        });
-    });
-  }
-
   private async createMeetings(
     mappedRow: ApplicationRow,
     application: Application,
diff --git a/services/apps/alcs/src/alcs/import/import.module.ts b/services/apps/alcs/src/alcs/import/import.module.ts
index 16e5d41d34..f64258d8b4 100644
--- a/services/apps/alcs/src/alcs/import/import.module.ts
+++ b/services/apps/alcs/src/alcs/import/import.module.ts
@@ -1,4 +1,5 @@
 import { Module } from '@nestjs/common';
+import { ApplicationSubmissionStatusModule } from '../application/application-submission-status/application-submission-status.module';
 import { ApplicationModule } from '../application/application.module';
 import { BoardModule } from '../board/board.module';
 import { CardModule } from '../card/card.module';
@@ -11,6 +12,7 @@ import { NoticeOfIntentImportService } from './noi-import.service';
   providers: [ApplicationImportService, NoticeOfIntentImportService],
   imports: [
     ApplicationModule,
+    ApplicationSubmissionStatusModule,
     BoardModule,
     NoticeOfIntentModule,
     NoticeOfIntentDecisionModule,
diff --git a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts
index bd7525d4ce..48ff11fcda 100644
--- a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts
+++ b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.spec.ts
@@ -43,7 +43,8 @@ describe('ApplicationAdvancedSearchService', () => {
     mockLocalGovernmentRepository = createMock();
 
     mockQuery = {
-      getManyAndCount: jest.fn().mockResolvedValue([[], 0]),
+      getMany: jest.fn().mockResolvedValue([]),
+      getCount: jest.fn().mockResolvedValue(0),
       orderBy: jest.fn().mockReturnThis(),
       offset: jest.fn().mockReturnThis(),
       limit: jest.fn().mockReturnThis(),
diff --git a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts
index 544c045fde..464c247373 100644
--- a/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts
+++ b/services/apps/alcs/src/alcs/search/application/application-advanced-search.service.ts
@@ -45,11 +45,11 @@ export class ApplicationAdvancedSearchService {
       .offset((searchDto.page - 1) * searchDto.pageSize)
       .limit(searchDto.pageSize);
 
-    const result = await query.getManyAndCount();
+    const results = await Promise.all([query.getMany(), query.getCount()]);
 
     return {
-      data: result[0],
-      total: result[1],
+      data: results[0],
+      total: results[1],
     };
   }
 
@@ -82,11 +82,6 @@ export class ApplicationAdvancedSearchService {
       //        submissions with deleted submission types to be shown. For now, there are no
       //        deleted submission types, so this should be fine, but should be fixed soon.
       .withDeleted()
-      .innerJoinAndMapOne(
-        'appSearch.applicationType',
-        'appSearch.applicationType',
-        'applicationType',
-      )
       .groupBy(
         `
               "appSearch"."uuid"
@@ -101,18 +96,6 @@ export class ApplicationAdvancedSearchService {
             , "appSearch"."status"
             , "appSearch"."date_submitted_to_alc"
             , "appSearch"."decision_date"
-            , "applicationType"."audit_deleted_date_at"
-            , "applicationType"."audit_created_at"
-            , "applicationType"."audit_updated_by"
-            , "applicationType"."audit_updated_at"
-            , "applicationType"."audit_created_by"
-            , "applicationType"."short_label"
-            , "applicationType"."label"
-            , "applicationType"."code"
-            , "applicationType"."background_color"
-            , "applicationType"."text_color"
-            , "applicationType"."html_description"
-            , "applicationType"."portal_label"
             , "appSearch"."is_draft"
             `,
       );
diff --git a/services/apps/alcs/src/alcs/search/application/application-search-view.entity.ts b/services/apps/alcs/src/alcs/search/application/application-search-view.entity.ts
index 0bf822873c..f8356b1f1f 100644
--- a/services/apps/alcs/src/alcs/search/application/application-search-view.entity.ts
+++ b/services/apps/alcs/src/alcs/search/application/application-search-view.entity.ts
@@ -1,14 +1,6 @@
-import {
-  DataSource,
-  JoinColumn,
-  ManyToOne,
-  PrimaryColumn,
-  ViewColumn,
-  ViewEntity,
-} from 'typeorm';
+import { DataSource, PrimaryColumn, ViewColumn, ViewEntity } from 'typeorm';
 import { ApplicationSubmission } from '../../../portal/application-submission/application-submission.entity';
 import { Application } from '../../application/application.entity';
-import { ApplicationType } from '../../code/application-code/application-type/application-type.entity';
 import { LocalGovernment } from '../../local-government/local-government.entity';
 
 // typeorm does not transform property names for the status
@@ -44,12 +36,6 @@ export class SearchApplicationSubmissionStatusType {
       )
       .from(ApplicationSubmission, 'as2')
       .innerJoin(Application, 'a', 'a.file_number = as2.file_number')
-      .withDeleted()
-      .innerJoinAndSelect(
-        ApplicationType,
-        'applicationType',
-        'as2.type_code = applicationType.code',
-      )
       .leftJoin(
         LocalGovernment,
         'localGovernment',
@@ -96,10 +82,4 @@ export class ApplicationSubmissionSearchView {
 
   @ViewColumn()
   decisionDate: Date | null;
-
-  @ManyToOne(() => ApplicationType, {
-    nullable: false,
-  })
-  @JoinColumn({ name: 'application_type_code' })
-  applicationType: ApplicationType;
 }
diff --git a/services/apps/alcs/src/alcs/search/search.controller.spec.ts b/services/apps/alcs/src/alcs/search/search.controller.spec.ts
index f6ef4253dd..ebf3a417ff 100644
--- a/services/apps/alcs/src/alcs/search/search.controller.spec.ts
+++ b/services/apps/alcs/src/alcs/search/search.controller.spec.ts
@@ -1,13 +1,15 @@
+import { getRepositoryToken } from '@nestjs/typeorm';
 import { classes } from 'automapper-classes';
 import { AutomapperModule } from 'automapper-nestjs';
 import { createMock, DeepMocked } from '@golevelup/nestjs-testing';
 import { Test, TestingModule } from '@nestjs/testing';
 import { ClsService } from 'nestjs-cls';
-import { DataSource, QueryRunner } from 'typeorm';
+import { DataSource, QueryRunner, Repository } from 'typeorm';
 import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes';
 import { Application } from '../application/application.entity';
 import { Board } from '../board/board.entity';
 import { Card } from '../card/card.entity';
+import { ApplicationType } from '../code/application-code/application-type/application-type.entity';
 import { Covenant } from '../covenant/covenant.entity';
 import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity';
 import { Notification } from '../notification/notification.entity';
@@ -29,6 +31,7 @@ describe('SearchController', () => {
   let mockNotificationAdvancedSearchService: DeepMocked<NotificationAdvancedSearchService>;
   let mockDataSource: DeepMocked<DataSource>;
   let mockQueryRunner: DeepMocked<QueryRunner>;
+  let mockAppTypeRepo: DeepMocked<Repository<ApplicationType>>;
 
   beforeEach(async () => {
     mockSearchService = createMock();
@@ -37,6 +40,7 @@ describe('SearchController', () => {
     mockNonApplicationsAdvancedSearchService = createMock();
     mockNotificationAdvancedSearchService = createMock();
     mockDataSource = createMock();
+    mockAppTypeRepo = createMock();
 
     const module: TestingModule = await Test.createTestingModule({
       imports: [
@@ -69,6 +73,10 @@ describe('SearchController', () => {
           provide: DataSource,
           useValue: mockDataSource,
         },
+        {
+          provide: getRepositoryToken(ApplicationType),
+          useValue: mockAppTypeRepo,
+        },
         {
           provide: ClsService,
           useValue: {},
diff --git a/services/apps/alcs/src/alcs/search/search.controller.ts b/services/apps/alcs/src/alcs/search/search.controller.ts
index af2209fdf4..3cf07d8e6d 100644
--- a/services/apps/alcs/src/alcs/search/search.controller.ts
+++ b/services/apps/alcs/src/alcs/search/search.controller.ts
@@ -1,16 +1,17 @@
 import { Body, Controller, Get, Param, Post, UseGuards } from '@nestjs/common';
 import { ApiOAuth2 } from '@nestjs/swagger';
-import { InjectDataSource } from '@nestjs/typeorm';
+import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';
 import { Mapper } from 'automapper-core';
 import { InjectMapper } from 'automapper-nestjs';
 import * as config from 'config';
-import { DataSource } from 'typeorm';
+import { DataSource, Repository } from 'typeorm';
 import { ROLES_ALLOWED_APPLICATIONS } from '../../common/authorization/roles';
 import { RolesGuard } from '../../common/authorization/roles-guard.service';
 import { UserRoles } from '../../common/authorization/roles.decorator';
 import { APPLICATION_SUBMISSION_TYPES } from '../../portal/pdf-generation/generate-submission-document.service';
 import { isStringSetAndNotEmpty } from '../../utils/string-helper';
 import { Application } from '../application/application.entity';
+import { ApplicationService } from '../application/application.service';
 import { CARD_TYPE } from '../card/card-type/card-type.entity';
 import { ApplicationTypeDto } from '../code/application-code/application-type/application-type.dto';
 import { ApplicationType } from '../code/application-code/application-type/application-type.entity';
@@ -49,6 +50,8 @@ export class SearchController {
     private applicationSearchService: ApplicationAdvancedSearchService,
     private nonApplicationsSearchService: NonApplicationsAdvancedSearchService,
     private notificationSearchService: NotificationAdvancedSearchService,
+    @InjectRepository(ApplicationType)
+    private appTypeRepo: Repository<ApplicationType>,
     @InjectDataSource()
     private dataSource: DataSource,
   ) {}
@@ -206,7 +209,7 @@ export class SearchController {
     const noticeOfIntents =
       await this.noticeOfIntentSearchService.searchNoticeOfIntents(searchDto);
 
-    const mappedSearchResult = this.mapAdvancedSearchResults(
+    const mappedSearchResult = await this.mapAdvancedSearchResults(
       null,
       noticeOfIntents,
       null,
@@ -227,7 +230,7 @@ export class SearchController {
     const nonApplications =
       await this.nonApplicationsSearchService.searchNonApplications(searchDto);
 
-    const mappedSearchResult = this.mapAdvancedSearchResults(
+    const mappedSearchResult = await this.mapAdvancedSearchResults(
       null,
       null,
       nonApplications,
@@ -248,7 +251,7 @@ export class SearchController {
     const notifications =
       await this.notificationSearchService.search(searchDto);
 
-    const mappedSearchResult = this.mapAdvancedSearchResults(
+    const mappedSearchResult = await this.mapAdvancedSearchResults(
       null,
       null,
       null,
@@ -317,7 +320,7 @@ export class SearchController {
     };
   }
 
-  private mapAdvancedSearchResults(
+  private async mapAdvancedSearchResults(
     applications: AdvancedSearchResultDto<
       ApplicationSubmissionSearchView[]
     > | null,
@@ -333,9 +336,15 @@ export class SearchController {
 
     const mappedApplications: ApplicationSearchResultDto[] = [];
     if (applications && applications.data.length > 0) {
+      const appTypes = await this.appTypeRepo.find();
+      const appTypeMap = new Map<string, ApplicationType>();
+      for (const type of appTypes) {
+        appTypeMap.set(type.code, type);
+      }
+
       mappedApplications.push(
         ...applications.data.map((app) =>
-          this.mapApplicationToAdvancedSearchResult(app),
+          this.mapApplicationToAdvancedSearchResult(app, appTypeMap),
         ),
       );
     }
@@ -445,13 +454,14 @@ export class SearchController {
 
   private mapApplicationToAdvancedSearchResult(
     application: ApplicationSubmissionSearchView,
+    appTypeMap: Map<string, ApplicationType>,
   ): ApplicationSearchResultDto {
     return {
       referenceId: application.fileNumber,
       fileNumber: application.fileNumber,
       dateSubmitted: application.dateSubmittedToAlc?.getTime(),
       type: this.mapper.map(
-        application.applicationType,
+        appTypeMap.get(application.applicationTypeCode),
         ApplicationType,
         ApplicationTypeDto,
       ),
diff --git a/services/apps/alcs/src/alcs/search/search.module.ts b/services/apps/alcs/src/alcs/search/search.module.ts
index a1a81244d1..1ba7c64f06 100644
--- a/services/apps/alcs/src/alcs/search/search.module.ts
+++ b/services/apps/alcs/src/alcs/search/search.module.ts
@@ -2,6 +2,8 @@ import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { ApplicationProfile } from '../../common/automapper/application.automapper.profile';
 import { Application } from '../application/application.entity';
+import { ApplicationModule } from '../application/application.module';
+import { ApplicationType } from '../code/application-code/application-type/application-type.entity';
 import { Covenant } from '../covenant/covenant.entity';
 import { LocalGovernment } from '../local-government/local-government.entity';
 import { NoticeOfIntent } from '../notice-of-intent/notice-of-intent.entity';
@@ -22,6 +24,7 @@ import { SearchService } from './search.service';
   imports: [
     TypeOrmModule.forFeature([
       Application,
+      ApplicationType,
       NoticeOfIntent,
       PlanningReview,
       Covenant,
diff --git a/services/apps/alcs/src/commands/import.ts b/services/apps/alcs/src/commands/import.ts
index 3b481cf1c9..9a1e4cca9f 100644
--- a/services/apps/alcs/src/commands/import.ts
+++ b/services/apps/alcs/src/commands/import.ts
@@ -1,5 +1,4 @@
 import { NestFactory } from '@nestjs/core';
-import { NestFastifyApplication } from '@nestjs/platform-fastify';
 import { Logger } from 'nestjs-pino';
 import { ApplicationImportService } from '../alcs/import/application-import.service';
 import { NoticeOfIntentImportService } from '../alcs/import/noi-import.service';
diff --git a/services/apps/alcs/src/main.ts b/services/apps/alcs/src/main.ts
index 425fe16a78..372dcf6e0d 100644
--- a/services/apps/alcs/src/main.ts
+++ b/services/apps/alcs/src/main.ts
@@ -12,7 +12,7 @@ import * as config from 'config';
 import { Logger } from 'nestjs-pino';
 import { install } from 'source-map-support';
 import { generateModuleGraph } from './commands/graph';
-import { importNOIs } from './commands/import';
+import { importApplications, importNOIs } from './commands/import';
 import { MainModule } from './main.module';
 
 const registerSwagger = (app: NestFastifyApplication) => {
@@ -108,7 +108,7 @@ async function bootstrap() {
     await generateModuleGraph(app);
   }
   if (extraArg == 'import') {
-    await importNOIs();
+    await importApplications();
   }
 
   // config variables
diff --git a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.entity.ts b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.entity.ts
index 7324aee811..1a421653d0 100644
--- a/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.entity.ts
+++ b/services/apps/alcs/src/portal/notification-submission/notification-parcel/notification-parcel.entity.ts
@@ -72,4 +72,22 @@ export class NotificationParcel extends Base {
   @AutoMap()
   @Column()
   notificationSubmissionUuid: string;
+
+  @Column({
+    select: false,
+    nullable: true,
+    type: 'int8',
+    comment:
+      'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_subject_properties to alcs.notification_parcel.',
+  })
+  oatsSubjectPropertyId: number;
+
+  @Column({
+    select: false,
+    nullable: true,
+    type: 'int8',
+    comment:
+      'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_properties to alcs.notification_parcel.',
+  })
+  oatsPropertyId: number;
 }
diff --git a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.entity.ts b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.entity.ts
index 7abcf172f6..919e8e4f5f 100644
--- a/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.entity.ts
+++ b/services/apps/alcs/src/portal/notification-submission/notification-transferee/notification-transferee.entity.ts
@@ -58,4 +58,13 @@ export class NotificationTransferee extends Base {
   @AutoMap()
   @Column()
   notificationSubmissionUuid: string;
+
+  @Column({
+    select: false,
+    nullable: true,
+    type: 'int8',
+    comment:
+      'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_alr_application_parties to alcs.notification_transferee.',
+  })
+  oatsAlrApplicationPartyId: number;
 }
diff --git a/services/apps/alcs/src/portal/public/public.dto.ts b/services/apps/alcs/src/portal/public/public.dto.ts
index f0c609416c..34cb906b66 100644
--- a/services/apps/alcs/src/portal/public/public.dto.ts
+++ b/services/apps/alcs/src/portal/public/public.dto.ts
@@ -78,6 +78,9 @@ export class PublicOwnerDto {
   @AutoMap(() => String)
   organizationName?: string | null;
 
+  @AutoMap(() => String)
+  crownLandOwnerType?: string | null;
+
   @AutoMap()
   type: OwnerTypeDto;
 }
diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts
index c739bd292d..9fc0826b1f 100644
--- a/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts
+++ b/services/apps/alcs/src/portal/public/search/application/public-application-search-view.entity.ts
@@ -1,100 +1,97 @@
-import {
-  JoinColumn,
-  ManyToOne,
-  PrimaryColumn,
-  ViewColumn,
-  ViewEntity,
-} from 'typeorm';
+import { DataSource, PrimaryColumn, ViewColumn, ViewEntity } from 'typeorm';
+import { ApplicationDecision } from '../../../../alcs/application-decision/application-decision.entity';
+import { SUBMISSION_STATUS } from '../../../../alcs/application/application-submission-status/submission-status.dto';
+import { ApplicationSubmissionToSubmissionStatus } from '../../../../alcs/application/application-submission-status/submission-status.entity';
+import { Application } from '../../../../alcs/application/application.entity';
 import { ApplicationType } from '../../../../alcs/code/application-code/application-type/application-type.entity';
+import { LocalGovernment } from '../../../../alcs/local-government/local-government.entity';
+import { ApplicationSubmission } from '../../../application-submission/application-submission.entity';
 import { LinkedStatusType } from '../public-search.dto';
 
 @ViewEntity({
-  expression: `
-    SELECT
-      app_sub.uuid,
-      app_sub.applicant,
-      app.uuid AS application_uuid,
-      "applicationType".audit_deleted_date_at AS "applicationType_audit_deleted_date_at",
-      "applicationType".audit_created_at AS "applicationType_audit_created_at",
-      "applicationType".audit_updated_at AS "applicationType_audit_updated_at",
-      "applicationType".audit_created_by AS "applicationType_audit_created_by",
-      "applicationType".audit_updated_by AS "applicationType_audit_updated_by",
-      "applicationType".label AS "applicationType_label",
-      "applicationType".code AS "applicationType_code",
-      "applicationType".description AS "applicationType_description",
-      "applicationType".short_label AS "applicationType_short_label",
-      "applicationType".background_color AS "applicationType_background_color",
-      "applicationType".text_color AS "applicationType_text_color",
-      "applicationType".html_description AS "applicationType_html_description",
-      "applicationType".portal_label AS "applicationType_portal_label",
-      "applicationType".portal_order AS "applicationType_portal_order",
-      "applicationType".requires_government_review AS "applicationType_requires_government_review",
-      "applicationType".alc_fee_amount AS "applicationType_alc_fee_amount",
-      "applicationType".government_fee_amount AS "applicationType_government_fee_amount",
-      "localGovernment".name AS local_government_name,
-      app_sub.file_number,
-      app_sub.local_government_uuid,
-      app_sub.type_code AS application_type_code,
-      app.date_submitted_to_alc,
-      app.decision_date,
-      decision_date.outcome,
-      decision_date.dest_rank,
-      app.region_code AS application_region_code,
-      GREATEST(status_link.effective_date, decision_date.date) AS last_update,
-      alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid) AS status
-    FROM
-      alcs.application_submission app_sub
-      JOIN alcs.application app ON app.file_number :: text = app_sub.file_number :: text
-      AND app.hide_from_portal = false
-      AND app.audit_deleted_date_at IS NULL
-      JOIN alcs.application_type "applicationType" ON app_sub.type_code :: text = "applicationType".code
-      LEFT JOIN alcs.local_government "localGovernment" ON app_sub.local_government_uuid = "localGovernment".uuid
-      AND "localGovernment".audit_deleted_date_at IS NULL
-      LEFT JOIN (
-        SELECT
-          max(status_link_1.effective_date) AS effective_date,
-          status_link_1.submission_uuid
-        FROM
-          alcs.application_submission_to_submission_status status_link_1
-        GROUP BY
-          status_link_1.submission_uuid
-      ) status_link ON status_link.submission_uuid = app_sub.uuid
-      LEFT JOIN (
-        SELECT
-          DISTINCT ON (decisions.applicationuuid) decisions.decisiondate AS date,
-          decisions.outcome,
-          decisions.dest_rank,
-          decisions.applicationuuid AS application_uuid
-        FROM
-          (
-            SELECT
-              decision.outcome_code AS outcome,
-              decision.date AS decisiondate,
-              decision.application_uuid AS applicationuuid,
-              rank() OVER (
-                PARTITION BY decision.application_uuid
-                ORDER BY
-                  decision.date DESC,
-                  decision.audit_created_at DESC
-              ) AS dest_rank
-            FROM
-              alcs.application_decision decision
-            WHERE
-              decision.is_draft = false
-              AND decision.audit_deleted_date_at IS NULL
-          ) decisions
-        WHERE
-          decisions.dest_rank = 1
-      ) decision_date ON decision_date.application_uuid = app.uuid
-    WHERE
-      app_sub.is_draft = false
-      AND app.date_received_all_items IS NOT NULL
-      AND app.date_received_all_items <= now()
-      AND (
-        alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid) ->> 'status_type_code' :: text
-      ) <> 'CANC' :: text
-      AND app_sub.audit_deleted_date_at IS NULL;
-  `,
+  expression: (datasource: DataSource) =>
+    datasource
+      .createQueryBuilder()
+      .select('app_sub.uuid', 'uuid')
+      .addSelect('app_sub.file_number', 'file_number')
+      .addSelect('app_sub.applicant', 'applicant')
+      .addSelect('app_sub.local_government_uuid', 'local_government_uuid')
+      .addSelect('localGovernment.name', 'local_government_name')
+      .addSelect('app_sub.type_code', 'application_type_code')
+      .addSelect('app.date_submitted_to_alc', 'date_submitted_to_alc')
+      .addSelect('app.decision_date', 'decision_date')
+      .addSelect('decision_date.outcome', 'outcome')
+      .addSelect('decision_date.dest_rank', 'dest_rank')
+      .addSelect('app.uuid', 'application_uuid')
+      .addSelect('app.region_code', 'application_region_code')
+      .addSelect(
+        'GREATEST(status_link.effective_date,  decision_date.date)',
+        'last_update',
+      )
+      .addSelect(
+        'alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid)',
+        'status',
+      )
+      .from(ApplicationSubmission, 'app_sub')
+      .innerJoin(
+        Application,
+        'app',
+        'app.file_number = app_sub.file_number AND app.hide_from_portal = FALSE',
+      )
+      .innerJoinAndSelect(
+        ApplicationType,
+        'applicationType',
+        'app_sub.type_code = applicationType.code',
+      )
+      .leftJoin(
+        LocalGovernment,
+        'localGovernment',
+        'app_sub.local_government_uuid = localGovernment.uuid',
+      )
+      .leftJoin(
+        (qb) =>
+          qb
+            .from(ApplicationSubmissionToSubmissionStatus, 'status_link')
+            .select('MAX("effective_date")', 'effective_date')
+            .addSelect('submission_uuid', 'submission_uuid')
+            .groupBy('submission_uuid'),
+        'status_link',
+        'status_link."submission_uuid" = app_sub.uuid',
+      )
+      .leftJoin(
+        (qb) =>
+          qb
+            .select('decisiondate', 'date')
+            .addSelect('outcome', 'outcome')
+            .addSelect('dest_rank', 'dest_rank')
+            .distinctOn(['application_uuid'])
+            .addSelect('applicationuuid', 'application_uuid')
+            .from(
+              qb
+                .subQuery()
+                .select('outcome_code', 'outcome')
+                .addSelect('date', 'decisiondate')
+                .addSelect('application_uuid', 'applicationuuid')
+                .addSelect(
+                  'RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC)',
+                  'dest_rank',
+                )
+                .where('is_draft = FALSE')
+                .from(ApplicationDecision, 'decision')
+                .getQuery(),
+              'decisions',
+            )
+            .where('dest_rank = 1'),
+        'decision_date',
+        'decision_date."application_uuid" = app.uuid',
+      )
+      .where('app_sub.is_draft = FALSE')
+      .andWhere(
+        '(app.date_received_all_items IS NOT NULL AND app.date_received_all_items <= NOW())',
+      )
+      .andWhere(
+        `alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid)->>'status_type_code' != '${SUBMISSION_STATUS.CANCELLED}'`,
+      ),
 })
 export class PublicApplicationSubmissionSearchView {
   @ViewColumn()
@@ -139,10 +136,4 @@ export class PublicApplicationSubmissionSearchView {
 
   @ViewColumn()
   outcome: string | null;
-
-  @ManyToOne(() => ApplicationType, {
-    nullable: false,
-  })
-  @JoinColumn({ name: 'application_type_code' })
-  applicationType: ApplicationType;
 }
diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts
index 56aca91f45..b5561d0daa 100644
--- a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts
+++ b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.spec.ts
@@ -38,7 +38,8 @@ describe('PublicApplicationSearchService', () => {
     mockLocalGovernmentRepository = createMock();
 
     mockQuery = {
-      getManyAndCount: jest.fn().mockResolvedValue([[], 0]),
+      getMany: jest.fn().mockResolvedValue([]),
+      getCount: jest.fn().mockResolvedValue(0),
       orderBy: jest.fn().mockReturnThis(),
       offset: jest.fn().mockReturnThis(),
       limit: jest.fn().mockReturnThis(),
diff --git a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts
index d6ae5c19c5..b0c908b0d2 100644
--- a/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts
+++ b/services/apps/alcs/src/portal/public/search/application/public-application-search.service.ts
@@ -35,11 +35,11 @@ export class PublicApplicationSearchService {
       .offset((searchDto.page - 1) * searchDto.pageSize)
       .limit(searchDto.pageSize);
 
-    const result = await query.getManyAndCount();
+    const results = await Promise.all([query.getMany(), query.getCount()]);
 
     return {
-      data: result[0],
-      total: result[1],
+      data: results[0],
+      total: results[1],
     };
   }
 
@@ -72,11 +72,6 @@ export class PublicApplicationSearchService {
       //        submissions with deleted application types to be shown. For now, there are no
       //        deleted application types, so this should be fine, but should be fixed soon.
       .withDeleted()
-      .innerJoinAndMapOne(
-        'appSearch.applicationType',
-        'appSearch.applicationType',
-        'applicationType',
-      )
       .groupBy(
         `
               "appSearch"."uuid"
@@ -93,18 +88,6 @@ export class PublicApplicationSearchService {
             , "appSearch"."date_submitted_to_alc"
             , "appSearch"."decision_date"
             , "appSearch"."last_update"
-            , "applicationType"."audit_deleted_date_at"
-            , "applicationType"."audit_created_at"
-            , "applicationType"."audit_updated_by"
-            , "applicationType"."audit_updated_at"
-            , "applicationType"."audit_created_by"
-            , "applicationType"."short_label"
-            , "applicationType"."label"
-            , "applicationType"."code"
-            , "applicationType"."background_color"
-            , "applicationType"."text_color"
-            , "applicationType"."html_description"
-            , "applicationType"."portal_label"
             `,
       );
     return query;
diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts
index a21c214987..5fc66c5976 100644
--- a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts
+++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search-view.entity.ts
@@ -83,6 +83,7 @@ import { LinkedStatusType } from '../public-search.dto';
                   'RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC, audit_created_at DESC)',
                   'dest_rank',
                 )
+                .where('is_draft = FALSE')
                 .from(NoticeOfIntentDecision, 'decision')
                 .getQuery(),
               'decisions',
diff --git a/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts b/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts
index f2a31538cc..f3fcc7c730 100644
--- a/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts
+++ b/services/apps/alcs/src/portal/public/search/public-search.controller.spec.ts
@@ -1,9 +1,12 @@
 import { createMock, DeepMocked } from '@golevelup/nestjs-testing';
 import { Test, TestingModule } from '@nestjs/testing';
+import { getRepositoryToken } from '@nestjs/typeorm';
 import { classes } from 'automapper-classes';
 import { AutomapperModule } from 'automapper-nestjs';
 import { ClsService } from 'nestjs-cls';
+import { Repository } from 'typeorm';
 import { mockKeyCloakProviders } from '../../../../test/mocks/mockTypes';
+import { ApplicationType } from '../../../alcs/code/application-code/application-type/application-type.entity';
 import { PublicApplicationSearchService } from './application/public-application-search.service';
 import { PublicNoticeOfIntentSearchService } from './notice-of-intent/public-notice-of-intent-search.service';
 import { PublicNotificationSearchService } from './notification/public-notification-search.service';
@@ -15,11 +18,13 @@ describe('PublicSearchController', () => {
   let mockNOIPublicSearchService: DeepMocked<PublicNoticeOfIntentSearchService>;
   let mockAppPublicSearchService: DeepMocked<PublicApplicationSearchService>;
   let mockNotiPublicSearchService: DeepMocked<PublicNotificationSearchService>;
+  let mockAppTypeRepo: DeepMocked<Repository<ApplicationType>>;
 
   beforeEach(async () => {
     mockNOIPublicSearchService = createMock();
     mockAppPublicSearchService = createMock();
     mockNotiPublicSearchService = createMock();
+    mockAppTypeRepo = createMock();
 
     const module: TestingModule = await Test.createTestingModule({
       imports: [
@@ -40,6 +45,10 @@ describe('PublicSearchController', () => {
           provide: PublicNotificationSearchService,
           useValue: mockNotiPublicSearchService,
         },
+        {
+          provide: getRepositoryToken(ApplicationType),
+          useValue: mockAppTypeRepo,
+        },
         {
           provide: ClsService,
           useValue: {},
diff --git a/services/apps/alcs/src/portal/public/search/public-search.controller.ts b/services/apps/alcs/src/portal/public/search/public-search.controller.ts
index dfaed85a7b..9a157aed70 100644
--- a/services/apps/alcs/src/portal/public/search/public-search.controller.ts
+++ b/services/apps/alcs/src/portal/public/search/public-search.controller.ts
@@ -1,7 +1,10 @@
+import { InjectRepository } from '@nestjs/typeorm';
 import { Mapper } from 'automapper-core';
 import { InjectMapper } from 'automapper-nestjs';
 import { Body, Controller, Post } from '@nestjs/common';
 import { Public } from 'nest-keycloak-connect';
+import { Repository } from 'typeorm';
+import { ApplicationType } from '../../../alcs/code/application-code/application-type/application-type.entity';
 import { isStringSetAndNotEmpty } from '../../../utils/string-helper';
 import { APPLICATION_SUBMISSION_TYPES } from '../../pdf-generation/generate-submission-document.service';
 import { PublicApplicationSubmissionSearchView } from './application/public-application-search-view.entity';
@@ -27,6 +30,8 @@ export class PublicSearchController {
     private noticeOfIntentSearchService: PublicNoticeOfIntentSearchService,
     private applicationSearchService: PublicApplicationSearchService,
     private notificationSearchService: PublicNotificationSearchService,
+    @InjectRepository(ApplicationType)
+    private appTypeRepo: Repository<ApplicationType>,
   ) {}
 
   @Post('/')
@@ -57,7 +62,7 @@ export class PublicSearchController {
       notifications = await this.notificationSearchService.search(searchDto);
     }
 
-    return this.mapSearchResults(
+    return await this.mapSearchResults(
       applicationSearchResult,
       noticeOfIntentResults,
       notifications,
@@ -71,7 +76,11 @@ export class PublicSearchController {
     const applications =
       await this.applicationSearchService.searchApplications(searchDto);
 
-    const mappedSearchResult = this.mapSearchResults(applications, null, null);
+    const mappedSearchResult = await this.mapSearchResults(
+      applications,
+      null,
+      null,
+    );
 
     return {
       total: mappedSearchResult.totalApplications,
@@ -86,7 +95,7 @@ export class PublicSearchController {
     const noticeOfIntents =
       await this.noticeOfIntentSearchService.searchNoticeOfIntents(searchDto);
 
-    const mappedSearchResult = this.mapSearchResults(
+    const mappedSearchResult = await this.mapSearchResults(
       null,
       noticeOfIntents,
       null,
@@ -105,7 +114,11 @@ export class PublicSearchController {
     const notifications =
       await this.notificationSearchService.search(searchDto);
 
-    const mappedSearchResult = this.mapSearchResults(null, null, notifications);
+    const mappedSearchResult = await this.mapSearchResults(
+      null,
+      null,
+      notifications,
+    );
 
     return {
       total: mappedSearchResult.totalNotifications,
@@ -153,7 +166,7 @@ export class PublicSearchController {
     };
   }
 
-  private mapSearchResults(
+  private async mapSearchResults(
     applications: AdvancedSearchResultDto<
       PublicApplicationSubmissionSearchView[]
     > | null,
@@ -168,9 +181,19 @@ export class PublicSearchController {
 
     const mappedApplications: ApplicationSearchResultDto[] = [];
     if (applications && applications.data.length > 0) {
+      const appTypes = await this.appTypeRepo.find({
+        select: {
+          code: true,
+          label: true,
+        },
+      });
+      const appTypeMap = new Map<string, ApplicationType>();
+      for (const type of appTypes) {
+        appTypeMap.set(type.code, type);
+      }
       mappedApplications.push(
         ...applications.data.map((app) =>
-          this.mapApplicationToSearchResult(app),
+          this.mapApplicationToSearchResult(app, appTypeMap),
         ),
       );
     }
@@ -205,12 +228,13 @@ export class PublicSearchController {
 
   private mapApplicationToSearchResult(
     application: PublicApplicationSubmissionSearchView,
+    appTypeMap: Map<string, ApplicationType>,
   ): ApplicationSearchResultDto {
     return {
       referenceId: application.fileNumber,
       fileNumber: application.fileNumber,
       dateSubmitted: application.dateSubmittedToAlc?.getTime(),
-      type: application.applicationType.label,
+      type: appTypeMap.get(application.applicationTypeCode)!.label,
       lastUpdate: application.lastUpdate?.getTime(),
       localGovernmentName: application.localGovernmentName,
       ownerName: application.applicant,
diff --git a/services/apps/alcs/src/portal/public/search/public-search.module.ts b/services/apps/alcs/src/portal/public/search/public-search.module.ts
index 46134e8250..7777fc8ffa 100644
--- a/services/apps/alcs/src/portal/public/search/public-search.module.ts
+++ b/services/apps/alcs/src/portal/public/search/public-search.module.ts
@@ -1,6 +1,7 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { Application } from '../../../alcs/application/application.entity';
+import { ApplicationType } from '../../../alcs/code/application-code/application-type/application-type.entity';
 import { LocalGovernment } from '../../../alcs/local-government/local-government.entity';
 import { NoticeOfIntent } from '../../../alcs/notice-of-intent/notice-of-intent.entity';
 import { Notification } from '../../../alcs/notification/notification.entity';
@@ -17,6 +18,7 @@ import { PublicSearchController } from './public-search.controller';
   imports: [
     TypeOrmModule.forFeature([
       Application,
+      ApplicationType,
       NoticeOfIntent,
       Notification,
       LocalGovernment,
diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1708558325989-add_oats_component_id_to_boundary_amendments.ts b/services/apps/alcs/src/providers/typeorm/migrations/1708558325989-add_oats_component_id_to_boundary_amendments.ts
new file mode 100644
index 0000000000..adcb395ed7
--- /dev/null
+++ b/services/apps/alcs/src/providers/typeorm/migrations/1708558325989-add_oats_component_id_to_boundary_amendments.ts
@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddOatsComponentIdToBoundaryAmendments1708558325989
+  implements MigrationInterface
+{
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "alcs"."application_boundary_amendment" ADD "oats_component_id" bigint`,
+    );
+    await queryRunner.query(
+      `COMMENT ON COLUMN "alcs"."application_boundary_amendment"."oats_component_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_alr_appl_components to alcs.application_boundary_amendment.'`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `COMMENT ON COLUMN "alcs"."application_boundary_amendment"."oats_component_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_alr_appl_components to alcs.application_boundary_amendment.'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "alcs"."application_boundary_amendment" DROP COLUMN "oats_component_id"`,
+    );
+  }
+}
diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1708976880966-remove_app_type_join_from_public.ts b/services/apps/alcs/src/providers/typeorm/migrations/1708976880966-remove_app_type_join_from_public.ts
new file mode 100644
index 0000000000..4f98622630
--- /dev/null
+++ b/services/apps/alcs/src/providers/typeorm/migrations/1708976880966-remove_app_type_join_from_public.ts
@@ -0,0 +1,197 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class RemoveAppTypeJoinFromPublic1708976880966
+  implements MigrationInterface
+{
+  name = 'RemoveAppTypeJoinFromPublic1708976880966';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`,
+      ['VIEW', 'public_application_submission_search_view', 'alcs'],
+    );
+    await queryRunner.query(
+      `DROP VIEW "alcs"."public_application_submission_search_view"`,
+    );
+    await queryRunner.query(`CREATE VIEW "alcs"."public_application_submission_search_view" AS 
+    SELECT
+      app_sub.uuid,
+      app_sub.applicant,
+      app.uuid AS application_uuid,
+      "localGovernment".name AS local_government_name,
+      app_sub.file_number,
+      app_sub.local_government_uuid,
+      app_sub.type_code AS application_type_code,
+      app.date_submitted_to_alc,
+      app.decision_date,
+      decision_date.outcome,
+      decision_date.dest_rank,
+      app.region_code AS application_region_code,
+      GREATEST(status_link.effective_date, decision_date.date) AS last_update,
+      alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid) AS status
+    FROM
+      alcs.application_submission app_sub
+      JOIN alcs.application app ON app.file_number :: text = app_sub.file_number :: text
+      AND app.hide_from_portal = false
+      AND app.audit_deleted_date_at IS NULL
+      LEFT JOIN alcs.local_government "localGovernment" ON app_sub.local_government_uuid = "localGovernment".uuid
+      AND "localGovernment".audit_deleted_date_at IS NULL
+      LEFT JOIN (
+        SELECT
+          max(status_link_1.effective_date) AS effective_date,
+          status_link_1.submission_uuid
+        FROM
+          alcs.application_submission_to_submission_status status_link_1
+        GROUP BY
+          status_link_1.submission_uuid
+      ) status_link ON status_link.submission_uuid = app_sub.uuid
+      LEFT JOIN (
+        SELECT
+          DISTINCT ON (decisions.applicationuuid) decisions.decisiondate AS date,
+          decisions.outcome,
+          decisions.dest_rank,
+          decisions.applicationuuid AS application_uuid
+        FROM
+          (
+            SELECT
+              decision.outcome_code AS outcome,
+              decision.date AS decisiondate,
+              decision.application_uuid AS applicationuuid,
+              rank() OVER (
+                PARTITION BY decision.application_uuid
+                ORDER BY
+                  decision.date DESC,
+                  decision.audit_created_at DESC
+              ) AS dest_rank
+            FROM
+              alcs.application_decision decision
+            WHERE
+              decision.is_draft = false
+              AND decision.audit_deleted_date_at IS NULL
+          ) decisions
+        WHERE
+          decisions.dest_rank = 1
+      ) decision_date ON decision_date.application_uuid = app.uuid
+    WHERE
+      app_sub.is_draft = false
+      AND app.date_received_all_items IS NOT NULL
+      AND app.date_received_all_items <= now()
+      AND (
+        alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid) ->> 'status_type_code' :: text
+      ) <> 'CANC' :: text
+      AND app_sub.audit_deleted_date_at IS NULL;
+  `);
+    await queryRunner.query(
+      `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`,
+      [
+        'alcs',
+        'VIEW',
+        'public_application_submission_search_view',
+        'SELECT\n      app_sub.uuid,\n      app_sub.applicant,\n      app.uuid AS application_uuid,\n      "localGovernment".name AS local_government_name,\n      app_sub.file_number,\n      app_sub.local_government_uuid,\n      app_sub.type_code AS application_type_code,\n      app.date_submitted_to_alc,\n      app.decision_date,\n      decision_date.outcome,\n      decision_date.dest_rank,\n      app.region_code AS application_region_code,\n      GREATEST(status_link.effective_date, decision_date.date) AS last_update,\n      alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid) AS status\n    FROM\n      alcs.application_submission app_sub\n      JOIN alcs.application app ON app.file_number :: text = app_sub.file_number :: text\n      AND app.hide_from_portal = false\n      AND app.audit_deleted_date_at IS NULL\n      LEFT JOIN alcs.local_government "localGovernment" ON app_sub.local_government_uuid = "localGovernment".uuid\n      AND "localGovernment".audit_deleted_date_at IS NULL\n      LEFT JOIN (\n        SELECT\n          max(status_link_1.effective_date) AS effective_date,\n          status_link_1.submission_uuid\n        FROM\n          alcs.application_submission_to_submission_status status_link_1\n        GROUP BY\n          status_link_1.submission_uuid\n      ) status_link ON status_link.submission_uuid = app_sub.uuid\n      LEFT JOIN (\n        SELECT\n          DISTINCT ON (decisions.applicationuuid) decisions.decisiondate AS date,\n          decisions.outcome,\n          decisions.dest_rank,\n          decisions.applicationuuid AS application_uuid\n        FROM\n          (\n            SELECT\n              decision.outcome_code AS outcome,\n              decision.date AS decisiondate,\n              decision.application_uuid AS applicationuuid,\n              rank() OVER (\n                PARTITION BY decision.application_uuid\n                ORDER BY\n                  decision.date DESC,\n                  decision.audit_created_at DESC\n              ) AS dest_rank\n            FROM\n              alcs.application_decision decision\n            WHERE\n              decision.is_draft = false\n              AND decision.audit_deleted_date_at IS NULL\n          ) decisions\n        WHERE\n          decisions.dest_rank = 1\n      ) decision_date ON decision_date.application_uuid = app.uuid\n    WHERE\n      app_sub.is_draft = false\n      AND app.date_received_all_items IS NOT NULL\n      AND app.date_received_all_items <= now()\n      AND (\n        alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid) ->> \'status_type_code\' :: text\n      ) <> \'CANC\' :: text\n      AND app_sub.audit_deleted_date_at IS NULL;',
+      ],
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`,
+      ['VIEW', 'public_application_submission_search_view', 'alcs'],
+    );
+    await queryRunner.query(
+      `DROP VIEW "alcs"."public_application_submission_search_view"`,
+    );
+    await queryRunner.query(
+      `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`,
+      [
+        'alcs',
+        'VIEW',
+        'public_application_submission_search_view',
+        'SELECT\n    app_sub.uuid,\n    app_sub.applicant,\n    app.uuid AS application_uuid,\n    "applicationType".audit_deleted_date_at AS "applicationType_audit_deleted_date_at",\n    "applicationType".audit_created_at AS "applicationType_audit_created_at",\n    "applicationType".audit_updated_at AS "applicationType_audit_updated_at",\n    "applicationType".audit_created_by AS "applicationType_audit_created_by",\n    "applicationType".audit_updated_by AS "applicationType_audit_updated_by",\n    "applicationType".label AS "applicationType_label",\n    "applicationType".code AS "applicationType_code",\n    "applicationType".description AS "applicationType_description",\n    "applicationType".short_label AS "applicationType_short_label",\n    "applicationType".background_color AS "applicationType_background_color",\n    "applicationType".text_color AS "applicationType_text_color",\n    "applicationType".html_description AS "applicationType_html_description",\n    "applicationType".portal_label AS "applicationType_portal_label",\n    "applicationType".portal_order AS "applicationType_portal_order",\n    "applicationType".requires_government_review AS "applicationType_requires_government_review",\n    "applicationType".alc_fee_amount AS "applicationType_alc_fee_amount",\n    "applicationType".government_fee_amount AS "applicationType_government_fee_amount",\n    "localGovernment".name AS local_government_name,\n    app_sub.file_number,\n    app_sub.local_government_uuid,\n    app_sub.type_code AS application_type_code,\n    app.date_submitted_to_alc,\n    app.decision_date,\n    decision_date.outcome,\n    decision_date.dest_rank,\n    app.region_code AS application_region_code,\n    GREATEST(status_link.effective_date, decision_date.date) AS last_update,\n    alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid) AS status\n  FROM\n    alcs.application_submission app_sub\n    JOIN alcs.application app ON app.file_number :: text = app_sub.file_number :: text\n    AND app.hide_from_portal = false\n    AND app.audit_deleted_date_at IS NULL\n    JOIN alcs.application_type "applicationType" ON app_sub.type_code :: text = "applicationType".code\n    LEFT JOIN alcs.local_government "localGovernment" ON app_sub.local_government_uuid = "localGovernment".uuid\n    AND "localGovernment".audit_deleted_date_at IS NULL\n    LEFT JOIN (\n      SELECT\n        max(status_link_1.effective_date) AS effective_date,\n        status_link_1.submission_uuid\n      FROM\n        alcs.application_submission_to_submission_status status_link_1\n      GROUP BY\n        status_link_1.submission_uuid\n    ) status_link ON status_link.submission_uuid = app_sub.uuid\n    LEFT JOIN (\n      SELECT\n        DISTINCT ON (decisions.applicationuuid) decisions.decisiondate AS date,\n        decisions.outcome,\n        decisions.dest_rank,\n        decisions.applicationuuid AS application_uuid\n      FROM\n        (\n          SELECT\n            decision.outcome_code AS outcome,\n            decision.date AS decisiondate,\n            decision.application_uuid AS applicationuuid,\n            rank() OVER (\n              PARTITION BY decision.application_uuid\n              ORDER BY\n                decision.date DESC,\n                decision.audit_created_at DESC\n            ) AS dest_rank\n          FROM\n            alcs.application_decision decision\n          WHERE\n            decision.is_draft = false\n            AND decision.audit_deleted_date_at IS NULL\n        ) decisions\n      WHERE\n        decisions.dest_rank = 1\n    ) decision_date ON decision_date.application_uuid = app.uuid\n  WHERE\n    app_sub.is_draft = false\n    AND app.date_received_all_items IS NOT NULL\n    AND app.date_received_all_items <= now()\n    AND (\n      alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid) ->> \'status_type_code\' :: text\n    ) <> \'CANC\' :: text\n    AND app_sub.audit_deleted_date_at IS NULL;',
+      ],
+    );
+    await queryRunner.query(`CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT
+    app_sub.uuid,
+    app_sub.applicant,
+    app.uuid AS application_uuid,
+    "applicationType".audit_deleted_date_at AS "applicationType_audit_deleted_date_at",
+    "applicationType".audit_created_at AS "applicationType_audit_created_at",
+    "applicationType".audit_updated_at AS "applicationType_audit_updated_at",
+    "applicationType".audit_created_by AS "applicationType_audit_created_by",
+    "applicationType".audit_updated_by AS "applicationType_audit_updated_by",
+    "applicationType".label AS "applicationType_label",
+    "applicationType".code AS "applicationType_code",
+    "applicationType".description AS "applicationType_description",
+    "applicationType".short_label AS "applicationType_short_label",
+    "applicationType".background_color AS "applicationType_background_color",
+    "applicationType".text_color AS "applicationType_text_color",
+    "applicationType".html_description AS "applicationType_html_description",
+    "applicationType".portal_label AS "applicationType_portal_label",
+    "applicationType".portal_order AS "applicationType_portal_order",
+    "applicationType".requires_government_review AS "applicationType_requires_government_review",
+    "applicationType".alc_fee_amount AS "applicationType_alc_fee_amount",
+    "applicationType".government_fee_amount AS "applicationType_government_fee_amount",
+    "localGovernment".name AS local_government_name,
+    app_sub.file_number,
+    app_sub.local_government_uuid,
+    app_sub.type_code AS application_type_code,
+    app.date_submitted_to_alc,
+    app.decision_date,
+    decision_date.outcome,
+    decision_date.dest_rank,
+    app.region_code AS application_region_code,
+    GREATEST(status_link.effective_date, decision_date.date) AS last_update,
+    alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid) AS status
+  FROM
+    alcs.application_submission app_sub
+    JOIN alcs.application app ON app.file_number :: text = app_sub.file_number :: text
+    AND app.hide_from_portal = false
+    AND app.audit_deleted_date_at IS NULL
+    JOIN alcs.application_type "applicationType" ON app_sub.type_code :: text = "applicationType".code
+    LEFT JOIN alcs.local_government "localGovernment" ON app_sub.local_government_uuid = "localGovernment".uuid
+    AND "localGovernment".audit_deleted_date_at IS NULL
+    LEFT JOIN (
+      SELECT
+        max(status_link_1.effective_date) AS effective_date,
+        status_link_1.submission_uuid
+      FROM
+        alcs.application_submission_to_submission_status status_link_1
+      GROUP BY
+        status_link_1.submission_uuid
+    ) status_link ON status_link.submission_uuid = app_sub.uuid
+    LEFT JOIN (
+      SELECT
+        DISTINCT ON (decisions.applicationuuid) decisions.decisiondate AS date,
+        decisions.outcome,
+        decisions.dest_rank,
+        decisions.applicationuuid AS application_uuid
+      FROM
+        (
+          SELECT
+            decision.outcome_code AS outcome,
+            decision.date AS decisiondate,
+            decision.application_uuid AS applicationuuid,
+            rank() OVER (
+              PARTITION BY decision.application_uuid
+              ORDER BY
+                decision.date DESC,
+                decision.audit_created_at DESC
+            ) AS dest_rank
+          FROM
+            alcs.application_decision decision
+          WHERE
+            decision.is_draft = false
+            AND decision.audit_deleted_date_at IS NULL
+        ) decisions
+      WHERE
+        decisions.dest_rank = 1
+    ) decision_date ON decision_date.application_uuid = app.uuid
+  WHERE
+    app_sub.is_draft = false
+    AND app.date_received_all_items IS NOT NULL
+    AND app.date_received_all_items <= now()
+    AND (
+      alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid) ->> 'status_type_code' :: text
+    ) <> 'CANC' :: text
+    AND app_sub.audit_deleted_date_at IS NULL;`);
+  }
+}
diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1709059569307-convert_ha_to_m2.ts b/services/apps/alcs/src/providers/typeorm/migrations/1709059569307-convert_ha_to_m2.ts
new file mode 100644
index 0000000000..3a3b18e513
--- /dev/null
+++ b/services/apps/alcs/src/providers/typeorm/migrations/1709059569307-convert_ha_to_m2.ts
@@ -0,0 +1,191 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class ConvertHaToM21709059569307 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // create backup tables for application in public schema
+    await queryRunner.query(`
+        -- application_submission
+        CREATE TABLE public.back_up_app_sub_ha_conversion (
+            uuid UUID PRIMARY KEY,
+            "file_number" TEXT,
+            nfu_total_fill_area numeric(15, 5),
+            soil_to_remove_area numeric(15, 5),
+            soil_to_place_area numeric(15, 5),
+            naru_to_place_area numeric(15, 5)
+        );
+        COMMENT ON TABLE public.back_up_app_sub_ha_conversion IS 'This is a backup table for application submissions values. Delete once confirmed that migration is successful.';
+
+        INSERT INTO public.back_up_app_sub_ha_conversion
+        SELECT
+            "uuid",
+            file_number ,
+            nfu_total_fill_area ,
+            soil_to_remove_area ,
+            soil_to_place_area ,
+            naru_to_place_area
+        FROM
+            alcs.application_submission as2
+        WHERE
+            as2.file_number::bigint < 100000
+            AND audit_created_by = 'oats_etl'
+            AND audit_updated_by IS NULL 
+            AND (nfu_total_fill_area IS NOT NULL OR soil_to_remove_area IS NOT NULL OR soil_to_place_area IS NOT NULL OR naru_to_place_area IS NOT NULL);
+        
+        -- application_decision_component
+        CREATE TABLE public.backup_app_dec_comp_ha_conversion (
+            uuid UUID PRIMARY KEY,
+            "file_number" TEXT,
+            soil_to_remove_area numeric(15, 5),
+            soil_to_place_area numeric(15, 5)
+        );
+        COMMENT ON TABLE public.backup_app_dec_comp_ha_conversion IS 'This is a backup table for application decisions components values. Delete once confirmed that migration is successful.';
+        
+        INSERT INTO public.backup_app_dec_comp_ha_conversion
+        SELECT
+            adc."uuid",
+            a.file_number ,
+            adc.soil_to_remove_area,
+            adc.soil_to_place_area
+        FROM
+            alcs.application_decision_component adc
+        JOIN alcs.application_decision ad ON
+            ad."uuid" = adc.application_decision_uuid
+        JOIN alcs.application a ON
+            a."uuid" = ad.application_uuid
+        WHERE
+            a.file_number::bigint < 100000
+            AND adc.audit_created_by = 'oats_etl'
+            AND adc.audit_updated_by IS NULL
+            AND (soil_to_remove_area IS NOT NULL OR soil_to_place_area IS NOT NULL );
+
+    `);
+
+    // update application
+    await queryRunner.query(`
+        UPDATE alcs.application_submission
+        SET 
+            nfu_total_fill_area = nfu_total_fill_area * 10000,
+            soil_to_remove_area = soil_to_remove_area * 10000,
+            soil_to_place_area = soil_to_place_area * 10000,
+            naru_to_place_area = naru_to_place_area * 10000
+        WHERE 
+            file_number::bigint < 100000
+            AND audit_created_by = 'oats_etl'
+            AND audit_updated_by IS NULL;
+
+
+        WITH components AS (
+            SELECT
+                a.file_number ,
+                adc."uuid",
+                adc.soil_to_remove_area,
+                adc.soil_to_place_area
+            FROM
+                alcs.application_decision_component adc
+            JOIN alcs.application_decision ad ON
+                ad."uuid" = adc.application_decision_uuid
+            JOIN alcs.application a ON
+                a."uuid" = ad.application_uuid
+            WHERE
+                a.file_number::bigint < 100000
+                AND adc.audit_created_by = 'oats_etl'
+                AND adc.audit_updated_by IS NULL
+                )
+            UPDATE alcs.application_decision_component 
+            SET soil_to_remove_area = components.soil_to_remove_area * 10000,
+                soil_to_place_area = components.soil_to_place_area * 10000
+            FROM components
+            WHERE components.uuid = alcs.application_decision_component.uuid;
+    `);
+
+    // create backup tables for noi in public schema
+    await queryRunner.query(`
+            CREATE TABLE public.backup_noi_sub_ha_conversion (
+                uuid UUID PRIMARY KEY,
+                "file_number" TEXT,
+                soil_to_remove_area numeric(15, 5),
+                soil_to_place_area numeric(15, 5)
+            );
+            COMMENT ON TABLE public.backup_noi_sub_ha_conversion IS 'This is a backup table for noi submissions values. Delete once confirmed that migration is successful.';
+            
+            INSERT INTO public.backup_noi_sub_ha_conversion
+            SELECT
+                "uuid",
+                file_number ,
+                soil_to_remove_area ,
+                soil_to_place_area 
+            FROM
+                alcs.notice_of_intent_submission nois 
+            WHERE
+                nois.file_number::bigint < 100000
+                AND audit_created_by = 'oats_etl'
+                AND audit_updated_by IS NULL
+                AND (soil_to_remove_area IS NOT NULL OR soil_to_place_area IS NOT NULL);
+
+            CREATE TABLE public.backup_noi_dec_comp_ha_conversion (
+                uuid UUID PRIMARY KEY,
+                "file_number" TEXT,
+                soil_to_remove_area numeric(15, 5),
+                soil_to_place_area numeric(15, 5)
+            );
+            COMMENT ON TABLE public.backup_noi_dec_comp_ha_conversion IS 'This is a backup table for noi decision components values. Delete once confirmed that migration is successful.';
+            
+            INSERT INTO public.backup_noi_dec_comp_ha_conversion
+            SELECT
+                ndc."uuid",
+                noi.file_number ,
+                ndc.soil_to_remove_area,
+                ndc.soil_to_place_area
+            FROM
+                alcs.notice_of_intent_decision_component ndc
+            JOIN alcs.notice_of_intent_decision nd ON
+                nd."uuid" = ndc.notice_of_intent_decision_uuid
+            JOIN alcs.notice_of_intent noi ON
+                noi."uuid" = nd.notice_of_intent_uuid
+            WHERE
+                noi.file_number::bigint < 100000
+                AND ndc.audit_created_by = 'oats_etl'
+                AND ndc.audit_updated_by IS NULL
+                AND (ndc.soil_to_remove_area IS NOT NULL OR ndc.soil_to_place_area IS NOT NULL);
+    `);
+
+    // update noi
+    await queryRunner.query(`
+            UPDATE alcs.notice_of_intent_submission 
+            SET 
+                soil_to_remove_area = soil_to_remove_area * 10000,
+                soil_to_place_area = soil_to_place_area * 10000
+            WHERE 
+                file_number::bigint < 100000
+                AND audit_created_by = 'oats_etl'
+                AND audit_updated_by IS NULL;
+                
+            WITH components AS (
+                SELECT
+                    noi.file_number,
+                    ndc."uuid",
+                    ndc.soil_to_remove_area,
+                    ndc.soil_to_place_area
+                FROM
+                    alcs.notice_of_intent_decision_component ndc
+                JOIN alcs.notice_of_intent_decision nd ON
+                    nd."uuid" = ndc.notice_of_intent_decision_uuid
+                JOIN alcs.notice_of_intent noi ON
+                    noi."uuid" = nd.notice_of_intent_uuid
+                WHERE
+                    noi.file_number::bigint < 100000
+                    AND ndc.audit_created_by = 'oats_etl'
+                    AND ndc.audit_updated_by IS NULL
+                    )
+            UPDATE alcs.notice_of_intent_decision_component 
+            SET soil_to_remove_area = components.soil_to_remove_area * 10000,
+                soil_to_place_area = components.soil_to_place_area * 10000
+            FROM components
+            WHERE components.uuid = alcs.notice_of_intent_decision_component.uuid;    
+    `);
+  }
+
+  public async down(): Promise<void> {
+    // not needed
+  }
+}
diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1709063190586-remove_app_type_join.ts b/services/apps/alcs/src/providers/typeorm/migrations/1709063190586-remove_app_type_join.ts
new file mode 100644
index 0000000000..0b805e7be4
--- /dev/null
+++ b/services/apps/alcs/src/providers/typeorm/migrations/1709063190586-remove_app_type_join.ts
@@ -0,0 +1,49 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class RemoveAppTypeJoin1709063190586 implements MigrationInterface {
+  name = 'RemoveAppTypeJoin1709063190586';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`,
+      ['VIEW', 'application_submission_search_view', 'alcs'],
+    );
+    await queryRunner.query(
+      `DROP VIEW "alcs"."application_submission_search_view"`,
+    );
+    await queryRunner.query(
+      `CREATE VIEW "alcs"."application_submission_search_view" AS SELECT "as2"."uuid" AS "uuid", "as2"."applicant" AS "applicant", "a"."uuid" AS "application_uuid", "localGovernment"."name" AS "local_government_name", "as2"."file_number" AS "file_number", "as2"."local_government_uuid" AS "local_government_uuid", "as2"."type_code" AS "application_type_code", "as2"."is_draft" AS "is_draft", "a"."legacy_id" AS "legacy_id", "a"."date_submitted_to_alc" AS "date_submitted_to_alc", "a"."decision_date" AS "decision_date", "a"."region_code" AS "application_region_code", alcs.get_current_status_for_application_submission_by_uuid("as2"."uuid") AS "status" FROM "alcs"."application_submission" "as2" INNER JOIN "alcs"."application" "a" ON  "a"."file_number" = "as2"."file_number" AND "a"."audit_deleted_date_at" IS NULL  LEFT JOIN "alcs"."local_government" "localGovernment" ON  "as2"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "as2"."audit_deleted_date_at" IS NULL`,
+    );
+    await queryRunner.query(
+      `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`,
+      [
+        'alcs',
+        'VIEW',
+        'application_submission_search_view',
+        'SELECT "as2"."uuid" AS "uuid", "as2"."applicant" AS "applicant", "a"."uuid" AS "application_uuid", "localGovernment"."name" AS "local_government_name", "as2"."file_number" AS "file_number", "as2"."local_government_uuid" AS "local_government_uuid", "as2"."type_code" AS "application_type_code", "as2"."is_draft" AS "is_draft", "a"."legacy_id" AS "legacy_id", "a"."date_submitted_to_alc" AS "date_submitted_to_alc", "a"."decision_date" AS "decision_date", "a"."region_code" AS "application_region_code", alcs.get_current_status_for_application_submission_by_uuid("as2"."uuid") AS "status" FROM "alcs"."application_submission" "as2" INNER JOIN "alcs"."application" "a" ON  "a"."file_number" = "as2"."file_number" AND "a"."audit_deleted_date_at" IS NULL  LEFT JOIN "alcs"."local_government" "localGovernment" ON  "as2"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL WHERE "as2"."audit_deleted_date_at" IS NULL',
+      ],
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`,
+      ['VIEW', 'application_submission_search_view', 'alcs'],
+    );
+    await queryRunner.query(
+      `DROP VIEW "alcs"."application_submission_search_view"`,
+    );
+    await queryRunner.query(
+      `CREATE VIEW "alcs"."application_submission_search_view" AS SELECT "as2"."uuid" AS "uuid", "as2"."applicant" AS "applicant", "a"."uuid" AS "application_uuid", "localGovernment"."name" AS "local_government_name", "as2"."file_number" AS "file_number", "as2"."local_government_uuid" AS "local_government_uuid", "as2"."type_code" AS "application_type_code", "as2"."is_draft" AS "is_draft", "a"."legacy_id" AS "legacy_id", "a"."date_submitted_to_alc" AS "date_submitted_to_alc", "a"."decision_date" AS "decision_date", "a"."region_code" AS "application_region_code", alcs.get_current_status_for_application_submission_by_uuid("as2"."uuid") AS "status" FROM "alcs"."application_submission" "as2" INNER JOIN "alcs"."application" "a" ON  "a"."file_number" = "as2"."file_number" AND "a"."audit_deleted_date_at" IS NULL  LEFT JOIN "alcs"."local_government" "localGovernment" ON "as2"."local_government_uuid" = "localGovernment"."uuid"`,
+    );
+    await queryRunner.query(
+      `INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`,
+      [
+        'alcs',
+        'VIEW',
+        'application_submission_search_view',
+        'SELECT "as2"."uuid" AS "uuid", "as2"."applicant" AS "applicant", "a"."uuid" AS "application_uuid", "localGovernment"."name" AS "local_government_name", "as2"."file_number" AS "file_number", "as2"."local_government_uuid" AS "local_government_uuid", "as2"."type_code" AS "application_type_code", "as2"."is_draft" AS "is_draft", "a"."legacy_id" AS "legacy_id", "a"."date_submitted_to_alc" AS "date_submitted_to_alc", "a"."decision_date" AS "decision_date", "a"."region_code" AS "application_region_code", alcs.get_current_status_for_application_submission_by_uuid("as2"."uuid") AS "status" FROM "alcs"."application_submission" "as2" INNER JOIN "alcs"."application" "a" ON  "a"."file_number" = "as2"."file_number" AND "a"."audit_deleted_date_at" IS NULL  LEFT JOIN "alcs"."local_government" "localGovernment" ON "as2"."local_government_uuid" = "localGovernment"."uuid"',
+      ],
+    );
+  }
+}
diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1709578449660-notification_oats_fields.ts b/services/apps/alcs/src/providers/typeorm/migrations/1709578449660-notification_oats_fields.ts
new file mode 100644
index 0000000000..ebc032a941
--- /dev/null
+++ b/services/apps/alcs/src/providers/typeorm/migrations/1709578449660-notification_oats_fields.ts
@@ -0,0 +1,35 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class NotificationOatsFields1709578449660 implements MigrationInterface {
+  name = 'NotificationOatsFields1709578449660';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "alcs"."notification_parcel" ADD "oats_subject_property_id" bigint`,
+    );
+    await queryRunner.query(
+      `COMMENT ON COLUMN "alcs"."notification_parcel"."oats_subject_property_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_subject_properties to alcs.notification_parcel.'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "alcs"."notification_parcel" ADD "oats_property_id" bigint`,
+    );
+    await queryRunner.query(
+      `COMMENT ON COLUMN "alcs"."notification_parcel"."oats_property_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_properties to alcs.notification_parcel.'`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `COMMENT ON COLUMN "alcs"."notification_parcel"."oats_property_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_properties to alcs.notification_parcel.'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "alcs"."notification_parcel" DROP COLUMN "oats_property_id"`,
+    );
+    await queryRunner.query(
+      `COMMENT ON COLUMN "alcs"."notification_parcel"."oats_subject_property_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_subject_properties to alcs.notification_parcel.'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "alcs"."notification_parcel" DROP COLUMN "oats_subject_property_id"`,
+    );
+  }
+}
diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1709593246898-alcs_oats_transferee_id.ts b/services/apps/alcs/src/providers/typeorm/migrations/1709593246898-alcs_oats_transferee_id.ts
new file mode 100644
index 0000000000..c6c8a68d30
--- /dev/null
+++ b/services/apps/alcs/src/providers/typeorm/migrations/1709593246898-alcs_oats_transferee_id.ts
@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AlcsOatsTransfereeId1709593246898 implements MigrationInterface {
+  name = 'AlcsOatsTransfereeId1709593246898';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "alcs"."notification_transferee" ADD "oats_alr_application_party_id" bigint`,
+    );
+    await queryRunner.query(
+      `COMMENT ON COLUMN "alcs"."notification_transferee"."oats_alr_application_party_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_alr_application_parties to alcs.notification_transferee.'`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `COMMENT ON COLUMN "alcs"."notification_transferee"."oats_alr_application_party_id" IS 'This column is NOT related to any functionality in ALCS. It is only used for ETL and backtracking of imported data from OATS. It links oats.oats_alr_application_parties to alcs.notification_transferee.'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "alcs"."notification_transferee" DROP COLUMN "oats_alr_application_party_id"`,
+    );
+  }
+}
diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1709659786345-filter_nois_with_draft_decisions_from_pub_search.ts b/services/apps/alcs/src/providers/typeorm/migrations/1709659786345-filter_nois_with_draft_decisions_from_pub_search.ts
new file mode 100644
index 0000000000..3c5f6fd63e
--- /dev/null
+++ b/services/apps/alcs/src/providers/typeorm/migrations/1709659786345-filter_nois_with_draft_decisions_from_pub_search.ts
@@ -0,0 +1,20 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class FilterNoisWithDraftDecisionsFromPubSearch1709659786345 implements MigrationInterface {
+    name = 'FilterNoisWithDraftDecisionsFromPubSearch1709659786345'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_notice_of_intent_submission_search_view","alcs"]);
+        await queryRunner.query(`DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`);
+        await queryRunner.query(`CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "noticeOfIntentType"."alc_fee_amount" AS "noticeOfIntentType_alc_fee_amount", "noticeOfIntentType"."government_fee_amount" AS "noticeOfIntentType_government_fee_amount", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date,  decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON  "noi"."file_number" = "noi_sub"."file_number" AND "noi"."hide_from_portal" = FALSE AND "noi"."audit_deleted_date_at" IS NULL  INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON  "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL  LEFT JOIN "alcs"."local_government" "localGovernment" ON  "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL  LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid"  LEFT JOIN (SELECT DISTINCT ON (notice_of_intentuuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", notice_of_intentuuid AS "notice_of_intent_uuid" FROM (SELECT outcome_code AS "outcome", date AS "decisiondate", notice_of_intent_uuid AS "notice_of_intentuuid", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."notice_of_intent_decision" "decision" WHERE ( is_draft = FALSE ) AND ( "decision"."audit_deleted_date_at" IS NULL )) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CANC' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`);
+        await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_notice_of_intent_submission_search_view","SELECT \"noi_sub\".\"uuid\" AS \"uuid\", \"noi_sub\".\"applicant\" AS \"applicant\", \"noi\".\"uuid\" AS \"notice_of_intent_uuid\", \"noticeOfIntentType\".\"audit_deleted_date_at\" AS \"noticeOfIntentType_audit_deleted_date_at\", \"noticeOfIntentType\".\"audit_created_at\" AS \"noticeOfIntentType_audit_created_at\", \"noticeOfIntentType\".\"audit_updated_at\" AS \"noticeOfIntentType_audit_updated_at\", \"noticeOfIntentType\".\"audit_created_by\" AS \"noticeOfIntentType_audit_created_by\", \"noticeOfIntentType\".\"audit_updated_by\" AS \"noticeOfIntentType_audit_updated_by\", \"noticeOfIntentType\".\"label\" AS \"noticeOfIntentType_label\", \"noticeOfIntentType\".\"code\" AS \"noticeOfIntentType_code\", \"noticeOfIntentType\".\"description\" AS \"noticeOfIntentType_description\", \"noticeOfIntentType\".\"short_label\" AS \"noticeOfIntentType_short_label\", \"noticeOfIntentType\".\"background_color\" AS \"noticeOfIntentType_background_color\", \"noticeOfIntentType\".\"text_color\" AS \"noticeOfIntentType_text_color\", \"noticeOfIntentType\".\"html_description\" AS \"noticeOfIntentType_html_description\", \"noticeOfIntentType\".\"portal_label\" AS \"noticeOfIntentType_portal_label\", \"noticeOfIntentType\".\"alc_fee_amount\" AS \"noticeOfIntentType_alc_fee_amount\", \"noticeOfIntentType\".\"government_fee_amount\" AS \"noticeOfIntentType_government_fee_amount\", \"localGovernment\".\"name\" AS \"local_government_name\", \"noi_sub\".\"file_number\" AS \"file_number\", \"noi_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"noi_sub\".\"type_code\" AS \"notice_of_intent_type_code\", \"noi\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"noi\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", decision_date.dest_rank AS \"dest_rank\", \"noi\".\"region_code\" AS \"notice_of_intent_region_code\", GREATEST(status_link.effective_date,  decision_date.date) AS \"last_update\", alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"notice_of_intent_submission\" \"noi_sub\" INNER JOIN \"alcs\".\"notice_of_intent\" \"noi\" ON  \"noi\".\"file_number\" = \"noi_sub\".\"file_number\" AND \"noi\".\"hide_from_portal\" = FALSE AND \"noi\".\"audit_deleted_date_at\" IS NULL  INNER JOIN \"alcs\".\"notice_of_intent_type\" \"noticeOfIntentType\" ON  \"noi_sub\".\"type_code\" = \"noticeOfIntentType\".\"code\" AND \"noticeOfIntentType\".\"audit_deleted_date_at\" IS NULL  LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON  \"noi_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL  LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"notice_of_intent_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"noi_sub\".\"uuid\"  LEFT JOIN (SELECT DISTINCT ON (notice_of_intentuuid) decisiondate AS \"date\", outcome AS \"outcome\", dest_rank AS \"dest_rank\", notice_of_intentuuid AS \"notice_of_intent_uuid\" FROM (SELECT outcome_code AS \"outcome\", date AS \"decisiondate\", notice_of_intent_uuid AS \"notice_of_intentuuid\", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC, audit_created_at DESC) AS \"dest_rank\" FROM \"alcs\".\"notice_of_intent_decision\" \"decision\" WHERE ( is_draft = FALSE ) AND ( \"decision\".\"audit_deleted_date_at\" IS NULL )) \"decisions\" WHERE dest_rank = 1) \"decision_date\" ON decision_date.\"notice_of_intent_uuid\" = \"noi\".\"uuid\" WHERE ( \"noi_sub\".\"is_draft\" = FALSE AND (\"noi\".\"date_received_all_items\" IS NOT NULL AND \"noi\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\")->>'status_type_code' != 'CANC' ) AND ( \"noi_sub\".\"audit_deleted_date_at\" IS NULL )"]);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_notice_of_intent_submission_search_view","alcs"]);
+        await queryRunner.query(`DROP VIEW "alcs"."public_notice_of_intent_submission_search_view"`);
+        await queryRunner.query(`CREATE VIEW "alcs"."public_notice_of_intent_submission_search_view" AS SELECT "noi_sub"."uuid" AS "uuid", "noi_sub"."applicant" AS "applicant", "noi"."uuid" AS "notice_of_intent_uuid", "noticeOfIntentType"."audit_deleted_date_at" AS "noticeOfIntentType_audit_deleted_date_at", "noticeOfIntentType"."audit_created_at" AS "noticeOfIntentType_audit_created_at", "noticeOfIntentType"."audit_updated_at" AS "noticeOfIntentType_audit_updated_at", "noticeOfIntentType"."audit_created_by" AS "noticeOfIntentType_audit_created_by", "noticeOfIntentType"."audit_updated_by" AS "noticeOfIntentType_audit_updated_by", "noticeOfIntentType"."label" AS "noticeOfIntentType_label", "noticeOfIntentType"."code" AS "noticeOfIntentType_code", "noticeOfIntentType"."description" AS "noticeOfIntentType_description", "noticeOfIntentType"."short_label" AS "noticeOfIntentType_short_label", "noticeOfIntentType"."background_color" AS "noticeOfIntentType_background_color", "noticeOfIntentType"."text_color" AS "noticeOfIntentType_text_color", "noticeOfIntentType"."html_description" AS "noticeOfIntentType_html_description", "noticeOfIntentType"."portal_label" AS "noticeOfIntentType_portal_label", "noticeOfIntentType"."alc_fee_amount" AS "noticeOfIntentType_alc_fee_amount", "noticeOfIntentType"."government_fee_amount" AS "noticeOfIntentType_government_fee_amount", "localGovernment"."name" AS "local_government_name", "noi_sub"."file_number" AS "file_number", "noi_sub"."local_government_uuid" AS "local_government_uuid", "noi_sub"."type_code" AS "notice_of_intent_type_code", "noi"."date_submitted_to_alc" AS "date_submitted_to_alc", "noi"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "noi"."region_code" AS "notice_of_intent_region_code", GREATEST(status_link.effective_date,  decision_date.date) AS "last_update", alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid") AS "status" FROM "alcs"."notice_of_intent_submission" "noi_sub" INNER JOIN "alcs"."notice_of_intent" "noi" ON  "noi"."file_number" = "noi_sub"."file_number" AND "noi"."hide_from_portal" = FALSE AND "noi"."audit_deleted_date_at" IS NULL  INNER JOIN "alcs"."notice_of_intent_type" "noticeOfIntentType" ON  "noi_sub"."type_code" = "noticeOfIntentType"."code" AND "noticeOfIntentType"."audit_deleted_date_at" IS NULL  LEFT JOIN "alcs"."local_government" "localGovernment" ON  "noi_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL  LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."notice_of_intent_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "noi_sub"."uuid"  LEFT JOIN (SELECT DISTINCT ON (notice_of_intentuuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", notice_of_intentuuid AS "notice_of_intent_uuid" FROM (SELECT outcome_code AS "outcome", date AS "decisiondate", notice_of_intent_uuid AS "notice_of_intentuuid", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."notice_of_intent_decision" "decision" WHERE "decision"."audit_deleted_date_at" IS NULL) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."notice_of_intent_uuid" = "noi"."uuid" WHERE ( "noi_sub"."is_draft" = FALSE AND ("noi"."date_received_all_items" IS NOT NULL AND "noi"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid("noi_sub"."uuid")->>'status_type_code' != 'CANC' ) AND ( "noi_sub"."audit_deleted_date_at" IS NULL )`);
+        await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_notice_of_intent_submission_search_view","SELECT \"noi_sub\".\"uuid\" AS \"uuid\", \"noi_sub\".\"applicant\" AS \"applicant\", \"noi\".\"uuid\" AS \"notice_of_intent_uuid\", \"noticeOfIntentType\".\"audit_deleted_date_at\" AS \"noticeOfIntentType_audit_deleted_date_at\", \"noticeOfIntentType\".\"audit_created_at\" AS \"noticeOfIntentType_audit_created_at\", \"noticeOfIntentType\".\"audit_updated_at\" AS \"noticeOfIntentType_audit_updated_at\", \"noticeOfIntentType\".\"audit_created_by\" AS \"noticeOfIntentType_audit_created_by\", \"noticeOfIntentType\".\"audit_updated_by\" AS \"noticeOfIntentType_audit_updated_by\", \"noticeOfIntentType\".\"label\" AS \"noticeOfIntentType_label\", \"noticeOfIntentType\".\"code\" AS \"noticeOfIntentType_code\", \"noticeOfIntentType\".\"description\" AS \"noticeOfIntentType_description\", \"noticeOfIntentType\".\"short_label\" AS \"noticeOfIntentType_short_label\", \"noticeOfIntentType\".\"background_color\" AS \"noticeOfIntentType_background_color\", \"noticeOfIntentType\".\"text_color\" AS \"noticeOfIntentType_text_color\", \"noticeOfIntentType\".\"html_description\" AS \"noticeOfIntentType_html_description\", \"noticeOfIntentType\".\"portal_label\" AS \"noticeOfIntentType_portal_label\", \"noticeOfIntentType\".\"alc_fee_amount\" AS \"noticeOfIntentType_alc_fee_amount\", \"noticeOfIntentType\".\"government_fee_amount\" AS \"noticeOfIntentType_government_fee_amount\", \"localGovernment\".\"name\" AS \"local_government_name\", \"noi_sub\".\"file_number\" AS \"file_number\", \"noi_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"noi_sub\".\"type_code\" AS \"notice_of_intent_type_code\", \"noi\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"noi\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", decision_date.dest_rank AS \"dest_rank\", \"noi\".\"region_code\" AS \"notice_of_intent_region_code\", GREATEST(status_link.effective_date,  decision_date.date) AS \"last_update\", alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"notice_of_intent_submission\" \"noi_sub\" INNER JOIN \"alcs\".\"notice_of_intent\" \"noi\" ON  \"noi\".\"file_number\" = \"noi_sub\".\"file_number\" AND \"noi\".\"hide_from_portal\" = FALSE AND \"noi\".\"audit_deleted_date_at\" IS NULL  INNER JOIN \"alcs\".\"notice_of_intent_type\" \"noticeOfIntentType\" ON  \"noi_sub\".\"type_code\" = \"noticeOfIntentType\".\"code\" AND \"noticeOfIntentType\".\"audit_deleted_date_at\" IS NULL  LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON  \"noi_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL  LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"notice_of_intent_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"noi_sub\".\"uuid\"  LEFT JOIN (SELECT DISTINCT ON (notice_of_intentuuid) decisiondate AS \"date\", outcome AS \"outcome\", dest_rank AS \"dest_rank\", notice_of_intentuuid AS \"notice_of_intent_uuid\" FROM (SELECT outcome_code AS \"outcome\", date AS \"decisiondate\", notice_of_intent_uuid AS \"notice_of_intentuuid\", RANK() OVER (PARTITION BY notice_of_intent_uuid ORDER BY date DESC, audit_created_at DESC) AS \"dest_rank\" FROM \"alcs\".\"notice_of_intent_decision\" \"decision\" WHERE \"decision\".\"audit_deleted_date_at\" IS NULL) \"decisions\" WHERE dest_rank = 1) \"decision_date\" ON decision_date.\"notice_of_intent_uuid\" = \"noi\".\"uuid\" WHERE ( \"noi_sub\".\"is_draft\" = FALSE AND (\"noi\".\"date_received_all_items\" IS NOT NULL AND \"noi\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_notice_of_intent_submission_by_uuid(\"noi_sub\".\"uuid\")->>'status_type_code' != 'CANC' ) AND ( \"noi_sub\".\"audit_deleted_date_at\" IS NULL )"]);
+    }
+
+}
diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1709669266230-use_query_builder_for_pub_app_search_view.ts b/services/apps/alcs/src/providers/typeorm/migrations/1709669266230-use_query_builder_for_pub_app_search_view.ts
new file mode 100644
index 0000000000..b9f5129c7a
--- /dev/null
+++ b/services/apps/alcs/src/providers/typeorm/migrations/1709669266230-use_query_builder_for_pub_app_search_view.ts
@@ -0,0 +1,85 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class UseQueryBuilderForPubAppSearchView1709669266230 implements MigrationInterface {
+    name = 'UseQueryBuilderForPubAppSearchView1709669266230'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_application_submission_search_view","alcs"]);
+        await queryRunner.query(`DROP VIEW "alcs"."public_application_submission_search_view"`);
+        await queryRunner.query(`CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT "app_sub"."uuid" AS "uuid", "app_sub"."applicant" AS "applicant", "app"."uuid" AS "application_uuid", "applicationType"."audit_deleted_date_at" AS "applicationType_audit_deleted_date_at", "applicationType"."audit_created_at" AS "applicationType_audit_created_at", "applicationType"."audit_updated_at" AS "applicationType_audit_updated_at", "applicationType"."audit_created_by" AS "applicationType_audit_created_by", "applicationType"."audit_updated_by" AS "applicationType_audit_updated_by", "applicationType"."label" AS "applicationType_label", "applicationType"."code" AS "applicationType_code", "applicationType"."description" AS "applicationType_description", "applicationType"."short_label" AS "applicationType_short_label", "applicationType"."background_color" AS "applicationType_background_color", "applicationType"."text_color" AS "applicationType_text_color", "applicationType"."html_description" AS "applicationType_html_description", "applicationType"."portal_label" AS "applicationType_portal_label", "applicationType"."portal_order" AS "applicationType_portal_order", "applicationType"."requires_government_review" AS "applicationType_requires_government_review", "applicationType"."alc_fee_amount" AS "applicationType_alc_fee_amount", "applicationType"."government_fee_amount" AS "applicationType_government_fee_amount", "localGovernment"."name" AS "local_government_name", "app_sub"."file_number" AS "file_number", "app_sub"."local_government_uuid" AS "local_government_uuid", "app_sub"."type_code" AS "application_type_code", "app"."date_submitted_to_alc" AS "date_submitted_to_alc", "app"."decision_date" AS "decision_date", decision_date.outcome AS "outcome", decision_date.dest_rank AS "dest_rank", "app"."region_code" AS "application_region_code", GREATEST(status_link.effective_date,  decision_date.date) AS "last_update", alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid") AS "status" FROM "alcs"."application_submission" "app_sub" INNER JOIN "alcs"."application" "app" ON  "app"."file_number" = "app_sub"."file_number" AND "app"."hide_from_portal" = FALSE AND "app"."audit_deleted_date_at" IS NULL  INNER JOIN "alcs"."application_type" "applicationType" ON  "app_sub"."type_code" = "applicationType"."code" AND "applicationType"."audit_deleted_date_at" IS NULL  LEFT JOIN "alcs"."local_government" "localGovernment" ON  "app_sub"."local_government_uuid" = "localGovernment"."uuid" AND "localGovernment"."audit_deleted_date_at" IS NULL  LEFT JOIN (SELECT MAX("effective_date") AS "effective_date", submission_uuid AS "submission_uuid" FROM "alcs"."application_submission_to_submission_status" "status_link" GROUP BY submission_uuid) "status_link" ON status_link."submission_uuid" = "app_sub"."uuid"  LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS "date", outcome AS "outcome", dest_rank AS "dest_rank", applicationuuid AS "application_uuid" FROM (SELECT outcome_code AS "outcome", date AS "decisiondate", application_uuid AS "applicationuuid", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS "dest_rank" FROM "alcs"."application_decision" "decision" WHERE ( is_draft = FALSE ) AND ( "decision"."audit_deleted_date_at" IS NULL )) "decisions" WHERE dest_rank = 1) "decision_date" ON decision_date."application_uuid" = "app"."uuid" WHERE ( "app_sub"."is_draft" = FALSE AND ("app"."date_received_all_items" IS NOT NULL AND "app"."date_received_all_items" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid("app_sub"."uuid")->>'status_type_code' != 'CANC' ) AND ( "app_sub"."audit_deleted_date_at" IS NULL )`);
+        await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_application_submission_search_view","SELECT \"app_sub\".\"uuid\" AS \"uuid\", \"app_sub\".\"applicant\" AS \"applicant\", \"app\".\"uuid\" AS \"application_uuid\", \"applicationType\".\"audit_deleted_date_at\" AS \"applicationType_audit_deleted_date_at\", \"applicationType\".\"audit_created_at\" AS \"applicationType_audit_created_at\", \"applicationType\".\"audit_updated_at\" AS \"applicationType_audit_updated_at\", \"applicationType\".\"audit_created_by\" AS \"applicationType_audit_created_by\", \"applicationType\".\"audit_updated_by\" AS \"applicationType_audit_updated_by\", \"applicationType\".\"label\" AS \"applicationType_label\", \"applicationType\".\"code\" AS \"applicationType_code\", \"applicationType\".\"description\" AS \"applicationType_description\", \"applicationType\".\"short_label\" AS \"applicationType_short_label\", \"applicationType\".\"background_color\" AS \"applicationType_background_color\", \"applicationType\".\"text_color\" AS \"applicationType_text_color\", \"applicationType\".\"html_description\" AS \"applicationType_html_description\", \"applicationType\".\"portal_label\" AS \"applicationType_portal_label\", \"applicationType\".\"portal_order\" AS \"applicationType_portal_order\", \"applicationType\".\"requires_government_review\" AS \"applicationType_requires_government_review\", \"applicationType\".\"alc_fee_amount\" AS \"applicationType_alc_fee_amount\", \"applicationType\".\"government_fee_amount\" AS \"applicationType_government_fee_amount\", \"localGovernment\".\"name\" AS \"local_government_name\", \"app_sub\".\"file_number\" AS \"file_number\", \"app_sub\".\"local_government_uuid\" AS \"local_government_uuid\", \"app_sub\".\"type_code\" AS \"application_type_code\", \"app\".\"date_submitted_to_alc\" AS \"date_submitted_to_alc\", \"app\".\"decision_date\" AS \"decision_date\", decision_date.outcome AS \"outcome\", decision_date.dest_rank AS \"dest_rank\", \"app\".\"region_code\" AS \"application_region_code\", GREATEST(status_link.effective_date,  decision_date.date) AS \"last_update\", alcs.get_current_status_for_application_submission_by_uuid(\"app_sub\".\"uuid\") AS \"status\" FROM \"alcs\".\"application_submission\" \"app_sub\" INNER JOIN \"alcs\".\"application\" \"app\" ON  \"app\".\"file_number\" = \"app_sub\".\"file_number\" AND \"app\".\"hide_from_portal\" = FALSE AND \"app\".\"audit_deleted_date_at\" IS NULL  INNER JOIN \"alcs\".\"application_type\" \"applicationType\" ON  \"app_sub\".\"type_code\" = \"applicationType\".\"code\" AND \"applicationType\".\"audit_deleted_date_at\" IS NULL  LEFT JOIN \"alcs\".\"local_government\" \"localGovernment\" ON  \"app_sub\".\"local_government_uuid\" = \"localGovernment\".\"uuid\" AND \"localGovernment\".\"audit_deleted_date_at\" IS NULL  LEFT JOIN (SELECT MAX(\"effective_date\") AS \"effective_date\", submission_uuid AS \"submission_uuid\" FROM \"alcs\".\"application_submission_to_submission_status\" \"status_link\" GROUP BY submission_uuid) \"status_link\" ON status_link.\"submission_uuid\" = \"app_sub\".\"uuid\"  LEFT JOIN (SELECT DISTINCT ON (application_uuid) decisiondate AS \"date\", outcome AS \"outcome\", dest_rank AS \"dest_rank\", applicationuuid AS \"application_uuid\" FROM (SELECT outcome_code AS \"outcome\", date AS \"decisiondate\", application_uuid AS \"applicationuuid\", RANK() OVER (PARTITION BY application_uuid ORDER BY date DESC, audit_created_at DESC) AS \"dest_rank\" FROM \"alcs\".\"application_decision\" \"decision\" WHERE ( is_draft = FALSE ) AND ( \"decision\".\"audit_deleted_date_at\" IS NULL )) \"decisions\" WHERE dest_rank = 1) \"decision_date\" ON decision_date.\"application_uuid\" = \"app\".\"uuid\" WHERE ( \"app_sub\".\"is_draft\" = FALSE AND (\"app\".\"date_received_all_items\" IS NOT NULL AND \"app\".\"date_received_all_items\" <= NOW()) AND alcs.get_current_status_for_application_submission_by_uuid(\"app_sub\".\"uuid\")->>'status_type_code' != 'CANC' ) AND ( \"app_sub\".\"audit_deleted_date_at\" IS NULL )"]);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DELETE FROM "alcs"."typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`, ["VIEW","public_application_submission_search_view","alcs"]);
+        await queryRunner.query(`DROP VIEW "alcs"."public_application_submission_search_view"`);
+        await queryRunner.query(`CREATE VIEW "alcs"."public_application_submission_search_view" AS SELECT
+      app_sub.uuid,
+      app_sub.applicant,
+      app.uuid AS application_uuid,
+      "localGovernment".name AS local_government_name,
+      app_sub.file_number,
+      app_sub.local_government_uuid,
+      app_sub.type_code AS application_type_code,
+      app.date_submitted_to_alc,
+      app.decision_date,
+      decision_date.outcome,
+      decision_date.dest_rank,
+      app.region_code AS application_region_code,
+      GREATEST(status_link.effective_date, decision_date.date) AS last_update,
+      alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid) AS status
+    FROM
+      alcs.application_submission app_sub
+      JOIN alcs.application app ON app.file_number :: text = app_sub.file_number :: text
+      AND app.hide_from_portal = false
+      AND app.audit_deleted_date_at IS NULL
+      LEFT JOIN alcs.local_government "localGovernment" ON app_sub.local_government_uuid = "localGovernment".uuid
+      AND "localGovernment".audit_deleted_date_at IS NULL
+      LEFT JOIN (
+        SELECT
+          max(status_link_1.effective_date) AS effective_date,
+          status_link_1.submission_uuid
+        FROM
+          alcs.application_submission_to_submission_status status_link_1
+        GROUP BY
+          status_link_1.submission_uuid
+      ) status_link ON status_link.submission_uuid = app_sub.uuid
+      LEFT JOIN (
+        SELECT
+          DISTINCT ON (decisions.applicationuuid) decisions.decisiondate AS date,
+          decisions.outcome,
+          decisions.dest_rank,
+          decisions.applicationuuid AS application_uuid
+        FROM
+          (
+            SELECT
+              decision.outcome_code AS outcome,
+              decision.date AS decisiondate,
+              decision.application_uuid AS applicationuuid,
+              rank() OVER (
+                PARTITION BY decision.application_uuid
+                ORDER BY
+                  decision.date DESC,
+                  decision.audit_created_at DESC
+              ) AS dest_rank
+            FROM
+              alcs.application_decision decision
+            WHERE
+              decision.is_draft = false
+              AND decision.audit_deleted_date_at IS NULL
+          ) decisions
+        WHERE
+          decisions.dest_rank = 1
+      ) decision_date ON decision_date.application_uuid = app.uuid
+    WHERE
+      app_sub.is_draft = false
+      AND app.date_received_all_items IS NOT NULL
+      AND app.date_received_all_items <= now()
+      AND (
+        alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid) ->> 'status_type_code' :: text
+      ) <> 'CANC' :: text
+      AND app_sub.audit_deleted_date_at IS NULL;`);
+        await queryRunner.query(`INSERT INTO "alcs"."typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`, ["alcs","VIEW","public_application_submission_search_view","SELECT\n      app_sub.uuid,\n      app_sub.applicant,\n      app.uuid AS application_uuid,\n      \"localGovernment\".name AS local_government_name,\n      app_sub.file_number,\n      app_sub.local_government_uuid,\n      app_sub.type_code AS application_type_code,\n      app.date_submitted_to_alc,\n      app.decision_date,\n      decision_date.outcome,\n      decision_date.dest_rank,\n      app.region_code AS application_region_code,\n      GREATEST(status_link.effective_date, decision_date.date) AS last_update,\n      alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid) AS status\n    FROM\n      alcs.application_submission app_sub\n      JOIN alcs.application app ON app.file_number :: text = app_sub.file_number :: text\n      AND app.hide_from_portal = false\n      AND app.audit_deleted_date_at IS NULL\n      LEFT JOIN alcs.local_government \"localGovernment\" ON app_sub.local_government_uuid = \"localGovernment\".uuid\n      AND \"localGovernment\".audit_deleted_date_at IS NULL\n      LEFT JOIN (\n        SELECT\n          max(status_link_1.effective_date) AS effective_date,\n          status_link_1.submission_uuid\n        FROM\n          alcs.application_submission_to_submission_status status_link_1\n        GROUP BY\n          status_link_1.submission_uuid\n      ) status_link ON status_link.submission_uuid = app_sub.uuid\n      LEFT JOIN (\n        SELECT\n          DISTINCT ON (decisions.applicationuuid) decisions.decisiondate AS date,\n          decisions.outcome,\n          decisions.dest_rank,\n          decisions.applicationuuid AS application_uuid\n        FROM\n          (\n            SELECT\n              decision.outcome_code AS outcome,\n              decision.date AS decisiondate,\n              decision.application_uuid AS applicationuuid,\n              rank() OVER (\n                PARTITION BY decision.application_uuid\n                ORDER BY\n                  decision.date DESC,\n                  decision.audit_created_at DESC\n              ) AS dest_rank\n            FROM\n              alcs.application_decision decision\n            WHERE\n              decision.is_draft = false\n              AND decision.audit_deleted_date_at IS NULL\n          ) decisions\n        WHERE\n          decisions.dest_rank = 1\n      ) decision_date ON decision_date.application_uuid = app.uuid\n    WHERE\n      app_sub.is_draft = false\n      AND app.date_received_all_items IS NOT NULL\n      AND app.date_received_all_items <= now()\n      AND (\n        alcs.get_current_status_for_application_submission_by_uuid(app_sub.uuid) ->> 'status_type_code' :: text\n      ) <> 'CANC' :: text\n      AND app_sub.audit_deleted_date_at IS NULL;"]);
+    }
+
+}
diff --git a/services/config/test.json b/services/config/test.json
index 88035fd760..ff95eda6a6 100644
--- a/services/config/test.json
+++ b/services/config/test.json
@@ -2,7 +2,8 @@
   "PORT": 8080,
   "BASE_URL": "localhost:8080",
   "DATABASE": {
-    "HOST": "localhost",
+    "MASTER_HOST": "localhost",
+    "SLAVE_HOST": "localhost",
     "PORT": 5432,
     "NAME": "postgres",
     "USER": "postgres",
diff --git a/services/templates/pdf/noi-submissions/noi-pfrs-submission-template.docx b/services/templates/pdf/noi-submissions/noi-pfrs-submission-template.docx
index 6f2135d476..3f4db6eec5 100644
Binary files a/services/templates/pdf/noi-submissions/noi-pfrs-submission-template.docx and b/services/templates/pdf/noi-submissions/noi-pfrs-submission-template.docx differ
diff --git a/services/templates/pdf/noi-submissions/noi-pofo-submission-template.docx b/services/templates/pdf/noi-submissions/noi-pofo-submission-template.docx
index 4f49ab16c4..8b4d5ad8f3 100644
Binary files a/services/templates/pdf/noi-submissions/noi-pofo-submission-template.docx and b/services/templates/pdf/noi-submissions/noi-pofo-submission-template.docx differ
diff --git a/services/templates/pdf/noi-submissions/noi-roso-submission-template.docx b/services/templates/pdf/noi-submissions/noi-roso-submission-template.docx
index bd285fd098..ad5dd79c08 100644
Binary files a/services/templates/pdf/noi-submissions/noi-roso-submission-template.docx and b/services/templates/pdf/noi-submissions/noi-roso-submission-template.docx differ
diff --git a/services/templates/pdf/srw-response-template.docx b/services/templates/pdf/srw-response-template.docx
index b51b58b435..534bdcd8a4 100644
Binary files a/services/templates/pdf/srw-response-template.docx and b/services/templates/pdf/srw-response-template.docx differ
diff --git a/services/templates/pdf/submissions/cove-submission-template.docx b/services/templates/pdf/submissions/cove-submission-template.docx
index 17e87c7de4..d059725ab6 100644
Binary files a/services/templates/pdf/submissions/cove-submission-template.docx and b/services/templates/pdf/submissions/cove-submission-template.docx differ
diff --git a/services/templates/pdf/submissions/excl-submission-template.docx b/services/templates/pdf/submissions/excl-submission-template.docx
index 3b3aa7ac70..e18cf2220e 100644
Binary files a/services/templates/pdf/submissions/excl-submission-template.docx and b/services/templates/pdf/submissions/excl-submission-template.docx differ
diff --git a/services/templates/pdf/submissions/incl-submission-template.docx b/services/templates/pdf/submissions/incl-submission-template.docx
index 8419f5d3a9..aba7590fbb 100644
Binary files a/services/templates/pdf/submissions/incl-submission-template.docx and b/services/templates/pdf/submissions/incl-submission-template.docx differ
diff --git a/services/templates/pdf/submissions/naru-submission-template.docx b/services/templates/pdf/submissions/naru-submission-template.docx
index 9dca6d4062..2c4359ad8c 100644
Binary files a/services/templates/pdf/submissions/naru-submission-template.docx and b/services/templates/pdf/submissions/naru-submission-template.docx differ
diff --git a/services/templates/pdf/submissions/nfu-submission-template.docx b/services/templates/pdf/submissions/nfu-submission-template.docx
index 80eed3250f..027fcc9974 100644
Binary files a/services/templates/pdf/submissions/nfu-submission-template.docx and b/services/templates/pdf/submissions/nfu-submission-template.docx differ
diff --git a/services/templates/pdf/submissions/pfrs-submission-template.docx b/services/templates/pdf/submissions/pfrs-submission-template.docx
index 599208e729..7caf24fe6b 100644
Binary files a/services/templates/pdf/submissions/pfrs-submission-template.docx and b/services/templates/pdf/submissions/pfrs-submission-template.docx differ
diff --git a/services/templates/pdf/submissions/pofo-submission-template.docx b/services/templates/pdf/submissions/pofo-submission-template.docx
index cf359eb9e4..d1456100e6 100644
Binary files a/services/templates/pdf/submissions/pofo-submission-template.docx and b/services/templates/pdf/submissions/pofo-submission-template.docx differ
diff --git a/services/templates/pdf/submissions/roso-submission-template.docx b/services/templates/pdf/submissions/roso-submission-template.docx
index 550335061f..3b15c8dcc1 100644
Binary files a/services/templates/pdf/submissions/roso-submission-template.docx and b/services/templates/pdf/submissions/roso-submission-template.docx differ
diff --git a/services/templates/pdf/submissions/subd-submission-template.docx b/services/templates/pdf/submissions/subd-submission-template.docx
index e8cee18015..5955c29ff2 100644
Binary files a/services/templates/pdf/submissions/subd-submission-template.docx and b/services/templates/pdf/submissions/subd-submission-template.docx differ
diff --git a/services/templates/pdf/submissions/tur-submission-template.docx b/services/templates/pdf/submissions/tur-submission-template.docx
index 30683256ad..d060892cfe 100644
Binary files a/services/templates/pdf/submissions/tur-submission-template.docx and b/services/templates/pdf/submissions/tur-submission-template.docx differ