diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html
index aae60b9ec3..e26a33bfdf 100644
--- a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html
+++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html
@@ -50,7 +50,7 @@
     </div>
     <div>
       {{ _applicationSubmission.soilToPlaceArea }}
-      <span *ngIf="_applicationSubmission.soilToPlaceArea !== null">ha</span>
+      <span *ngIf="_applicationSubmission.soilToPlaceArea !== null">m<sup>2</sup></span>
     </div>
 
     <div><strong>Maximum Depth</strong></div>
diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html
index 4f1fa8616b..8ec3a2ec4c 100644
--- a/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html
+++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html
@@ -34,7 +34,8 @@
   </div>
   <div class="subheading2 grid-1">Area</div>
   <div class="grid-double">
-    {{ _applicationSubmission.soilToRemoveArea }} <span *ngIf="_applicationSubmission.soilToRemoveArea">ha</span>
+    {{ _applicationSubmission.soilToRemoveArea }}
+    <span *ngIf="_applicationSubmission.soilToRemoveArea">m<sup>2</sup></span>
   </div>
   <div class="subheading2 grid-1">Maximum Depth</div>
   <div class="grid-double">
@@ -58,7 +59,7 @@
   <div class="subheading2 grid-1">Area</div>
   <div class="grid-double">
     {{ _applicationSubmission.soilAlreadyRemovedArea }}
-    <span *ngIf="_applicationSubmission.soilAlreadyRemovedArea">ha</span>
+    <span *ngIf="_applicationSubmission.soilAlreadyRemovedArea">m<sup>2</sup></span>
   </div>
   <div class="subheading2 grid-1">Maximum Depth</div>
   <div class="grid-double">
diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.html
index c0c255826b..5262069026 100644
--- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.html
+++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/notice-of-intent-details.component.html
@@ -56,7 +56,7 @@ <h3>Primary Contact Information</h3>
       </div>
     </ng-container>
     <div class="full-width center">
-      <button *ngIf="showEdit" [disabled]="disableEdit" (click)="onEdit(2)" mat-flat-button color="accent">
+      <button *ngIf="showEdit" [disabled]="disableEdit" (click)="onEdit(1)" mat-flat-button color="accent">
         Edit Section
       </button>
     </div>
@@ -123,7 +123,7 @@ <h4>Land Use of Adjacent Parcels</h4>
       </div>
     </div>
     <div class="full-width center">
-      <button *ngIf="showEdit" [disabled]="disableEdit" (click)="onEdit(4)" mat-flat-button color="accent">
+      <button *ngIf="showEdit" [disabled]="disableEdit" (click)="onEdit(3)" mat-flat-button color="accent">
         Edit Section
       </button>
     </div>
@@ -148,7 +148,7 @@ <h3>Proposal</h3>
   ></app-pfrs-details>
   <div class="review-table edit-section">
     <div class="full-width center">
-      <button *ngIf="showEdit" [disabled]="disableEdit" (click)="onEdit(5)" mat-flat-button color="accent">
+      <button *ngIf="showEdit" [disabled]="disableEdit" (click)="onEdit(4)" mat-flat-button color="accent">
         Edit Section
       </button>
     </div>
diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html
index 6d18c33b0e..6337b33368 100644
--- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html
+++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/roso-details/roso-details.component.html
@@ -41,7 +41,7 @@
     </div>
     <div class="grid-1"><strong>Area</strong></div>
     <div class="grid-2">
-      {{ _noiSubmission.soilToRemoveArea }} <span *ngIf="_noiSubmission.soilToRemoveArea">ha</span>
+      {{ _noiSubmission.soilToRemoveArea }} <span *ngIf="_noiSubmission.soilToRemoveArea">m<sup>2</sup></span>
     </div>
     <div class="grid-1"><strong>Maximum Depth</strong></div>
     <div class="grid-2">
@@ -69,7 +69,7 @@
     <div class="grid-1"><strong>Area</strong></div>
     <div class="grid-2">
       {{ _noiSubmission.soilAlreadyRemovedArea }}
-      <span *ngIf="_noiSubmission.soilAlreadyRemovedArea !== null">ha</span>
+      <span *ngIf="_noiSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span>
     </div>
     <div class="grid-1"><strong>Maximum Depth</strong></div>
     <div class="grid-2">
@@ -107,7 +107,7 @@
 
     <div class="subheading2 grid-1">Reclamation Plan</div>
     <div class="grid-double multiple-documents">
-      <a *ngFor="let file of crossSections" (click)="openFile(file)">
+      <a *ngFor="let file of reclamationPlans" (click)="openFile(file)">
         {{ file.fileName }}
       </a>
     </div>
diff --git a/bin/migrate-oats-data/applications/migrate_application.py b/bin/migrate-oats-data/applications/migrate_application.py
index 9e577e57ab..1897a487a6 100644
--- a/bin/migrate-oats-data/applications/migrate_application.py
+++ b/bin/migrate-oats-data/applications/migrate_application.py
@@ -69,7 +69,7 @@ def process_application_etl(batch_size):
     update_application_incomplete_date(batch_size)
     process_application_parcels(batch_size)
     process_application_owners(batch_size)
-    process_application_applicant_on_submissions(batch_size)
+    # process_application_applicant_on_submissions(batch_size)
     process_app_staff_journal(batch_size)
     process_application_decisions(batch_size)
     set_application_visibility()
diff --git a/bin/migrate-oats-data/noi/notice_of_intent_migration.py b/bin/migrate-oats-data/noi/notice_of_intent_migration.py
index 9abca8b32e..4ae73f54e2 100644
--- a/bin/migrate-oats-data/noi/notice_of_intent_migration.py
+++ b/bin/migrate-oats-data/noi/notice_of_intent_migration.py
@@ -177,7 +177,7 @@ def process_notice_of_intent(batch_size):
 
     link_notice_of_intent_primary_contacts(batch_size)
 
-    process_notice_of_intent_applicant_on_submissions(batch_size)
+    # process_notice_of_intent_applicant_on_submissions(batch_size)
 
     process_noi_staff_journal(batch_size)
 
diff --git a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html
index 747c34d3db..73b18432a7 100644
--- a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html
+++ b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html
@@ -225,10 +225,10 @@
 
   <div class="subheading2 grid-1">Reclamation Plan</div>
   <div class="grid-double multiple-documents">
-    <a *ngFor="let file of crossSections" (click)="openFile(file.uuid)">
+    <a *ngFor="let file of reclamationPlans" (click)="openFile(file.uuid)">
       {{ file.fileName }}
     </a>
-    <app-no-data [showRequired]="showErrors" *ngIf="crossSections.length === 0"></app-no-data>
+    <app-no-data [showRequired]="showErrors" *ngIf="reclamationPlans.length === 0"></app-no-data>
   </div>
 
   <div class="subheading2 grid-1">Is your proposal for aggregate extraction or placer mining?</div>
diff --git a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html
index cc775d83bd..e958c483d3 100644
--- a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html
+++ b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html
@@ -149,10 +149,10 @@
 
   <div class="subheading2 grid-1">Reclamation Plan</div>
   <div class="grid-double multiple-documents">
-    <a *ngFor="let file of crossSections" (click)="openFile(file.uuid)">
+    <a *ngFor="let file of reclamationPlans" (click)="openFile(file.uuid)">
       {{ file.fileName }}
     </a>
-    <app-no-data [showRequired]="showErrors" *ngIf="crossSections.length === 0"></app-no-data>
+    <app-no-data [showRequired]="showErrors" *ngIf="reclamationPlans.length === 0"></app-no-data>
   </div>
 
   <div *ngIf="showEdit" class="edit-button">
diff --git a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html
index 673913480f..30deb8ab54 100644
--- a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html
+++ b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html
@@ -141,10 +141,10 @@
 
   <div class="subheading2 grid-1">Reclamation Plan</div>
   <div class="grid-double multiple-documents">
-    <a *ngFor="let file of crossSections" (click)="openFile(file.uuid)">
+    <a *ngFor="let file of reclamationPlans" (click)="openFile(file.uuid)">
       {{ file.fileName }}
     </a>
-    <app-no-data [showRequired]="showErrors" *ngIf="crossSections.length === 0"></app-no-data>
+    <app-no-data [showRequired]="showErrors" *ngIf="reclamationPlans.length === 0"></app-no-data>
   </div>
 
   <div *ngIf="showEdit" class="edit-button">
diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts
index b484fdc1d5..8f3af7c8d7 100644
--- a/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts
+++ b/portal-frontend/src/app/features/applications/review-submission/review-submit-fng/review-submit-fng.component.ts
@@ -11,7 +11,7 @@ import { ApplicationSubmissionDto } from '../../../../services/application-submi
 import { CodeService } from '../../../../services/code/code.service';
 import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service';
 import { CustomStepperComponent } from '../../../../shared/custom-stepper/custom-stepper.component';
-import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto';
+import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../../../shared/dto/document.dto';
 import { MOBILE_BREAKPOINT } from '../../../../shared/utils/breakpoints';
 import { ReviewApplicationFngSteps } from '../review-submission.component';
 import { ToastService } from '../../../../services/toast/toast.service';
@@ -71,7 +71,9 @@ export class ReviewSubmitFngComponent implements OnInit, OnDestroy {
       this.resolutionDocument = documents.filter(
         (document) => document.type?.code === DOCUMENT_TYPE.RESOLUTION_DOCUMENT
       );
-      this.otherAttachments = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.OTHER);
+      this.otherAttachments = documents.filter(
+        (document) => document.type?.code === DOCUMENT_TYPE.OTHER && document.source === DOCUMENT_SOURCE.LFNG
+      );
     });
 
     this.$application.pipe(takeUntil(this.$destroy)).subscribe((application) => {
diff --git a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts
index 8acd011147..e378a07b28 100644
--- a/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts
+++ b/portal-frontend/src/app/features/applications/review-submission/review-submit/review-submit.component.ts
@@ -11,7 +11,7 @@ import { ApplicationSubmissionDto } from '../../../../services/application-submi
 import { PdfGenerationService } from '../../../../services/pdf-generation/pdf-generation.service';
 import { ToastService } from '../../../../services/toast/toast.service';
 import { CustomStepperComponent } from '../../../../shared/custom-stepper/custom-stepper.component';
-import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto';
+import { DOCUMENT_SOURCE, DOCUMENT_TYPE } from '../../../../shared/dto/document.dto';
 import { MOBILE_BREAKPOINT } from '../../../../shared/utils/breakpoints';
 import { ReviewApplicationSteps } from '../review-submission.component';
 import { SubmitConfirmationDialogComponent } from '../submit-confirmation-dialog/submit-confirmation-dialog.component';
@@ -81,7 +81,9 @@ export class ReviewSubmitComponent implements OnInit, OnDestroy {
         (document) => document.type?.code === DOCUMENT_TYPE.RESOLUTION_DOCUMENT
       );
       this.staffReport = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.STAFF_REPORT);
-      this.otherAttachments = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.OTHER);
+      this.otherAttachments = documents.filter(
+        (document) => document.type?.code === DOCUMENT_TYPE.OTHER && document.source === DOCUMENT_SOURCE.LFNG
+      );
     });
 
     this.$application.pipe(takeUntil(this.$destroy)).subscribe((application) => {
diff --git a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html
index 25327afdf9..1c818bd65c 100644
--- a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html
+++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.html
@@ -1,6 +1,9 @@
 <div class="table-wrapper">
   <div class="table-container">
-    <table mat-table [dataSource]="dataSource">
+    <div *ngIf="isLoading" class="center">
+      <mat-spinner />
+    </div>
+    <table *ngIf="!isLoading" mat-table [dataSource]="dataSource">
       <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
       <tr
         mat-row
@@ -57,9 +60,9 @@
       </ng-container>
     </table>
     <mat-paginator
-      [length]="_totalCount"
+      [length]="totalCount"
       [pageIndex]="pageIndex"
-      [pageSize]="10"
+      [pageSize]="itemsPerPage"
       [pageSizeOptions]="[5, 10, 25, 100]"
       (page)="onPageChange($event)"
       aria-label="Select page"
diff --git a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts
index f727fb9469..e7feaa9c74 100644
--- a/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts
+++ b/portal-frontend/src/app/features/home/inbox/inbox-table/inbox-table.component.ts
@@ -1,9 +1,7 @@
-import { Component, EventEmitter, Input, OnDestroy, Output, ViewChild } from '@angular/core';
-import { MatPaginator, PageEvent } from '@angular/material/paginator';
-import { MatSort } from '@angular/material/sort';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { PageEvent } from '@angular/material/paginator';
 import { MatTableDataSource } from '@angular/material/table';
 import { Router } from '@angular/router';
-import { Subject, takeUntil } from 'rxjs';
 import { TableChange } from '../../../public/search/search.interface';
 import { InboxResultDto } from '../inbox.component';
 
@@ -12,42 +10,32 @@ import { InboxResultDto } from '../inbox.component';
   templateUrl: './inbox-table.component.html',
   styleUrls: ['./inbox-table.component.scss'],
 })
-export class InboxTableComponent implements OnDestroy {
-  $destroy = new Subject<void>();
-
-  @ViewChild(MatPaginator) paginator!: MatPaginator;
-  @ViewChild(MatSort) sort?: MatSort;
-
+export class InboxTableComponent {
   _items: InboxResultDto[] = [];
   @Input() set items(applications: InboxResultDto[]) {
     this._items = applications;
+    this.isLoading = false;
     this.dataSource = new MatTableDataSource<InboxResultDto>(applications);
   }
 
-  _totalCount = 0;
-  @Input() set totalCount(count: number) {
-    this._totalCount = count;
-
-    // this will ensure the reset of subscriber once the table is hidden because of empty
-    this.initSorting();
-  }
-
+  @Input() totalCount: number = 0;
   @Input() type = 'Applications';
+  @Input() pageIndex: number = 0;
+
   @Output() tableChange = new EventEmitter<TableChange>();
 
   displayedColumns: string[] = ['fileNumber', 'dateCreated', 'applicant', 'applicationType', 'status', 'lastUpdated'];
   dataSource = new MatTableDataSource<InboxResultDto>();
-  @Input() pageIndex: number = 0;
   itemsPerPage = 10;
   total = 0;
   sortDirection = 'DESC';
   sortField = 'lastUpdate';
-
-  private subscribedToSort = false;
+  isLoading = false;
 
   constructor(private router: Router) {}
 
-  async onTableChange() {
+  onTableChange() {
+    this.isLoading = true;
     this.tableChange.emit({
       pageIndex: this.pageIndex,
       itemsPerPage: this.itemsPerPage,
@@ -61,33 +49,7 @@ export class InboxTableComponent implements OnDestroy {
     this.pageIndex = $event.pageIndex;
     this.itemsPerPage = $event.pageSize;
 
-    await this.onTableChange();
-  }
-
-  ngOnDestroy(): void {
-    this.$destroy.next();
-    this.$destroy.complete();
-  }
-
-  private initSorting() {
-    if (this._totalCount <= 0) {
-      this.subscribedToSort = false;
-    }
-
-    // push subscription to next render cycle, after the table is rendered
-    setTimeout(() => {
-      if (this.sort && !this.subscribedToSort) {
-        this.subscribedToSort = true;
-        this.sort.sortChange.pipe(takeUntil(this.$destroy)).subscribe(async (sortObj) => {
-          this.paginator.pageIndex = 0;
-          this.pageIndex = 0;
-          this.sortDirection = sortObj.direction.toUpperCase();
-          this.sortField = sortObj.active;
-
-          await this.onTableChange();
-        });
-      }
-    });
+    this.onTableChange();
   }
 
   async onRowClick(link: string) {
diff --git a/portal-frontend/src/app/features/home/inbox/inbox.component.ts b/portal-frontend/src/app/features/home/inbox/inbox.component.ts
index 6975ffdf18..208f279f0b 100644
--- a/portal-frontend/src/app/features/home/inbox/inbox.component.ts
+++ b/portal-frontend/src/app/features/home/inbox/inbox.component.ts
@@ -206,6 +206,7 @@ export class InboxComponent implements OnInit, OnDestroy {
   async onClear() {
     this.searchForm.reset();
     this.pageIndex = 0;
+    this.itemsPerPage = 10;
     await this.populateTable();
     this.tabIndex = TAB_ORDER[this.currentTabName];
     if (this.fileTypeFilterDropDownComponent) {
@@ -318,7 +319,6 @@ export class InboxComponent implements OnInit, OnDestroy {
     this.pageIndex = event.pageIndex;
     this.itemsPerPage = event.itemsPerPage;
 
-    this.isLoading = true;
     switch (event.tableType) {
       case 'APP':
         await this.onApplicationSearch();
@@ -332,7 +332,6 @@ export class InboxComponent implements OnInit, OnDestroy {
       default:
         this.toastService.showErrorToast('Not implemented');
     }
-    this.isLoading = false;
   }
 
   onFileTypeChange(fileTypes: string[]) {
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts
index 444569c277..ad45e840e0 100644
--- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts
+++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/parcels/parcel-entry/parcel-entry.component.ts
@@ -260,13 +260,13 @@ export class ParcelEntryComponent implements OnInit {
         this.searchBy.setValue(null);
         this.pidPinPlaceholder = '';
         this.isCrownLand = true;
-        this.pid.addValidators([Validators.required]);
+        this.pid.removeValidators([Validators.required]);
         this.purchaseDate.disable();
       } else {
         this.searchBy.setValue('pid');
         this.pidPinPlaceholder = 'Type 9 digit PID';
         this.isCrownLand = false;
-        this.pid.removeValidators([Validators.required]);
+        this.pid.addValidators([Validators.required]);
         this.crownLandOwnerType.setValue(null);
         this.purchaseDate.enable();
       }
diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html
index 92d7428243..39c1e9bf7a 100644
--- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html
+++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/pofo-details/pofo-details.component.html
@@ -32,10 +32,7 @@
     <div *ngIf="_noiSubmission.soilProjectDuration">
       {{ _noiSubmission.soilProjectDuration }}
     </div>
-    <app-no-data
-      [showRequired]="showErrors"
-      *ngIf="!_noiSubmission.soilProjectDuration"
-    ></app-no-data>
+    <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilProjectDuration"></app-no-data>
   </div>
 
   <div class="full-width soil-table">
@@ -60,20 +57,14 @@
     <div>
       {{ _noiSubmission.soilToPlaceMaximumDepth }}
       <span *ngIf="_noiSubmission.soilToPlaceMaximumDepth !== null">m</span>
-      <app-no-data
-        [showRequired]="showErrors"
-        *ngIf="_noiSubmission.soilToPlaceMaximumDepth === null"
-      ></app-no-data>
+      <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilToPlaceMaximumDepth === null"></app-no-data>
     </div>
 
     <div class="subheading2">Average Depth</div>
     <div>
       {{ _noiSubmission.soilToPlaceAverageDepth }}
       <span *ngIf="_noiSubmission.soilToPlaceAverageDepth !== null">m</span>
-      <app-no-data
-        [showRequired]="showErrors"
-        *ngIf="_noiSubmission.soilToPlaceAverageDepth === null"
-      ></app-no-data>
+      <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilToPlaceAverageDepth === null"></app-no-data>
     </div>
 
     <div></div>
@@ -83,20 +74,14 @@
     <div>
       {{ _noiSubmission.soilAlreadyPlacedVolume }}
       <span *ngIf="_noiSubmission.soilAlreadyPlacedVolume !== null">m<sup>3</sup></span>
-      <app-no-data
-        [showRequired]="showErrors"
-        *ngIf="_noiSubmission.soilAlreadyPlacedVolume === null"
-      ></app-no-data>
+      <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyPlacedVolume === null"></app-no-data>
     </div>
 
     <div class="subheading2">Area</div>
     <div>
       {{ _noiSubmission.soilAlreadyPlacedArea }}
       <span *ngIf="_noiSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span>
-      <app-no-data
-        [showRequired]="showErrors"
-        *ngIf="_noiSubmission.soilAlreadyPlacedArea === null"
-      ></app-no-data>
+      <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyPlacedArea === null"></app-no-data>
     </div>
 
     <div class="subheading2">Maximum Depth</div>
@@ -147,10 +132,10 @@
 
     <div class="subheading2 grid-1">Reclamation Plan</div>
     <div class="grid-double">
-      <a *ngFor="let file of crossSections" (click)="openFile(file.uuid)">
+      <a *ngFor="let file of reclamationPlans" (click)="openFile(file.uuid)">
         {{ file.fileName }}
       </a>
-      <app-no-data [showRequired]="showErrors" *ngIf="crossSections.length === 0"></app-no-data>
+      <app-no-data [showRequired]="showErrors" *ngIf="reclamationPlans.length === 0"></app-no-data>
     </div>
   </ng-container>
 
diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html
index 78153f3530..da49f8bb95 100644
--- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html
+++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/roso-details/roso-details.component.html
@@ -32,10 +32,7 @@
     <div *ngIf="_noiSubmission.soilProjectDuration">
       {{ _noiSubmission.soilProjectDuration }}
     </div>
-    <app-no-data
-      [showRequired]="showErrors"
-      *ngIf="!_noiSubmission.soilProjectDuration"
-    ></app-no-data>
+    <app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilProjectDuration"></app-no-data>
   </div>
 
   <div class="full-width soil-table">
@@ -60,20 +57,14 @@
     <div>
       {{ _noiSubmission.soilToRemoveMaximumDepth }}
       <span *ngIf="_noiSubmission.soilToRemoveMaximumDepth !== null">m</span>
-      <app-no-data
-        [showRequired]="showErrors"
-        *ngIf="_noiSubmission.soilToRemoveMaximumDepth === null"
-      ></app-no-data>
+      <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilToRemoveMaximumDepth === null"></app-no-data>
     </div>
 
     <div class="subheading2">Average Depth</div>
     <div>
       {{ _noiSubmission.soilToRemoveAverageDepth }}
       <span *ngIf="_noiSubmission.soilToRemoveAverageDepth !== null">m</span>
-      <app-no-data
-        [showRequired]="showErrors"
-        *ngIf="_noiSubmission.soilToRemoveAverageDepth === null"
-      ></app-no-data>
+      <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilToRemoveAverageDepth === null"></app-no-data>
     </div>
 
     <div></div>
@@ -83,20 +74,14 @@
     <div>
       {{ _noiSubmission.soilAlreadyRemovedVolume }}
       <span *ngIf="_noiSubmission.soilAlreadyRemovedVolume !== null">m<sup>3</sup></span>
-      <app-no-data
-        [showRequired]="showErrors"
-        *ngIf="_noiSubmission.soilAlreadyRemovedVolume === null"
-      ></app-no-data>
+      <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyRemovedVolume === null"></app-no-data>
     </div>
 
     <div class="subheading2">Area</div>
     <div>
       {{ _noiSubmission.soilAlreadyRemovedArea }}
       <span *ngIf="_noiSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span>
-      <app-no-data
-        [showRequired]="showErrors"
-        *ngIf="_noiSubmission.soilAlreadyRemovedArea === null"
-      ></app-no-data>
+      <app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyRemovedArea === null"></app-no-data>
     </div>
 
     <div class="subheading2">Maximum Depth</div>
@@ -146,10 +131,10 @@
 
     <div class="subheading2 grid-1">Reclamation Plan</div>
     <div class="grid-double multiple-documents">
-      <a *ngFor="let file of crossSections" (click)="openFile(file.uuid)">
+      <a *ngFor="let file of reclamationPlans" (click)="openFile(file.uuid)">
         {{ file.fileName }}
       </a>
-      <app-no-data [showRequired]="showErrors" *ngIf="crossSections.length === 0"></app-no-data>
+      <app-no-data [showRequired]="showErrors" *ngIf="reclamationPlans.length === 0"></app-no-data>
     </div>
 
     <div class="subheading2 grid-1">
diff --git a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.html b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.html
index 45f473c3d5..c5429a7155 100644
--- a/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.html
+++ b/portal-frontend/src/app/features/public/notice-of-intent/alc-review/submission-documents/submission-documents.component.html
@@ -1,4 +1,4 @@
-<h4>Application Documents</h4>
+<h4>NOI Documents</h4>
 <div class="table-container">
   <table mat-table [dataSource]="dataSource" matSort class="mat-elevation-z3 documents">
     <ng-container matColumnDef="type">
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 b5ea5e4cfa..711c0dbd86 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
@@ -1,5 +1,5 @@
 <h3 class="flex-item">
-  {{ pageTitle }}
+  Notice of Intent Parcels
 </h3>
 <div class="review-table">
   <ng-container *ngFor="let parcel of parcels; let parcelInd = index">
diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.ts b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.ts
index 1003ec555c..0a04e6d925 100644
--- a/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.ts
+++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.ts
@@ -16,8 +16,6 @@ export class ParcelComponent {
   @Input() parcels: PublicParcelDto[] = [];
 
   PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE;
-  pageTitle: string = 'Identify Parcel(s) Under Application';
-
   fileId = '';
   submissionUuid = '';
 
diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html
index 21a210a05f..1dedd56018 100644
--- a/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html
+++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/roso-details/roso-details.component.html
@@ -45,14 +45,14 @@
     <div>
       {{ noiSubmission.soilToRemoveVolume }}
       <span *ngIf="noiSubmission.soilToRemoveVolume !== null">m<sup>3</sup></span>
-      <app-no-data [*ngIf="noiSubmission.soilToRemoveVolume === null"></app-no-data>
+      <app-no-data *ngIf="noiSubmission.soilToRemoveVolume === null"></app-no-data>
     </div>
 
     <div class="subheading2">Area</div>
     <div>
       {{ noiSubmission.soilToRemoveArea }}
       <span *ngIf="noiSubmission.soilToRemoveArea !== null">m<sup>2</sup></span>
-      <app-no-data [*ngIf="noiSubmission.soilToRemoveArea === null"></app-no-data>
+      <app-no-data *ngIf="noiSubmission.soilToRemoveArea === null"></app-no-data>
     </div>
 
     <div class="subheading2">Maximum Depth</div>
@@ -112,7 +112,7 @@
       ></app-no-data>
     </div>
   </div>
-  
+
   <div class="subheading2 grid-1">Proposal Map / Site Plan</div>
   <div class="grid-double">
     <a *ngFor="let map of proposalMap" (click)="openFile(map.uuid)">
diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.html b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.html
index bb1808e87c..617744affc 100644
--- a/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.html
+++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/submission-details.component.html
@@ -47,7 +47,7 @@ <h3>Government</h3>
   <h3>Land Use</h3>
   <div *ngIf="submission" class="review-table">
     <div class="full-width">
-      <h4>Land Use of Parcel(s) under Application</h4>
+      <h4>Land Use of Parcel(s) under Notice of Intent</h4>
     </div>
     <div class="subheading2 grid-1">Describe all agriculture that currently takes place on the parcel(s).</div>
     <div class="grid-double">
diff --git a/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.html b/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.html
index bc3633f49f..17d67ae729 100644
--- a/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.html
+++ b/portal-frontend/src/app/features/public/notification/alc-review/alc-review.component.html
@@ -1,6 +1,6 @@
 <div>
   <div class="header">
-    <h2>ALC Review and Decision</h2>
+    <h2>ALC Review and Response</h2>
   </div>
   <div>
     <app-submission-documents [submission]="submission" [documents]="documents"></app-submission-documents>
diff --git a/portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.html b/portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.html
index 45f473c3d5..50da3b831d 100644
--- a/portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.html
+++ b/portal-frontend/src/app/features/public/notification/alc-review/submission-documents/submission-documents.component.html
@@ -1,4 +1,4 @@
-<h4>Application Documents</h4>
+<h4>Notification Documents</h4>
 <div class="table-container">
   <table mat-table [dataSource]="dataSource" matSort class="mat-elevation-z3 documents">
     <ng-container matColumnDef="type">
diff --git a/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.html b/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.html
index 2e4020737c..b2d8d1c3fd 100644
--- a/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.html
+++ b/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.html
@@ -1,6 +1,4 @@
-<h3 class="flex-item">
-  {{ pageTitle }}
-</h3>
+<h3 class="flex-item">Notification Parcels</h3>
 <div class="review-table">
   <ng-container *ngFor="let parcel of parcels; let parcelInd = index">
     <div class="full-width flex-space-between-wrap">
diff --git a/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.ts b/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.ts
index acaab1ad3e..7296b0960d 100644
--- a/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.ts
+++ b/portal-frontend/src/app/features/public/notification/submission/parcel/parcel.component.ts
@@ -17,8 +17,6 @@ export class ParcelComponent {
   @Input() parcels: PublicParcelDto[] = [];
 
   PARCEL_OWNERSHIP_TYPES = PARCEL_OWNERSHIP_TYPE;
-  pageTitle: string = 'Identify Parcel(s) Under Application';
-
   fileId = '';
   submissionUuid = '';
 
diff --git a/portal-frontend/src/app/features/public/notification/submission/submission-details.component.html b/portal-frontend/src/app/features/public/notification/submission/submission-details.component.html
index e4e90ec4d5..413772ce72 100644
--- a/portal-frontend/src/app/features/public/notification/submission/submission-details.component.html
+++ b/portal-frontend/src/app/features/public/notification/submission/submission-details.component.html
@@ -47,6 +47,6 @@ <h3>Government</h3>
   </div>
 </section>
 <section *ngIf="submission">
-  <h3>5. Purpose of SRW</h3>
+  <h3>Purpose of SRW</h3>
   <app-proposal-details [submission]="submission"></app-proposal-details>
 </section>
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 448cb1da86..d6ae5c19c5 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
@@ -198,7 +198,7 @@ export class PublicApplicationSearchService {
     query = query.leftJoin(
       ApplicationDecision,
       'decision',
-      'decision.application_uuid = "appSearch"."application_uuid"',
+      'decision.application_uuid = "appSearch"."application_uuid" AND decision.is_draft = FALSE',
     );
     return query;
   }
diff --git a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts
index 6d167bdc34..e62df61df0 100644
--- a/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts
+++ b/services/apps/alcs/src/portal/public/search/notice-of-intent/public-notice-of-intent-search.service.ts
@@ -191,7 +191,7 @@ export class PublicNoticeOfIntentSearchService {
     query = query.leftJoin(
       NoticeOfIntentDecision,
       'decision',
-      'decision.notice_of_intent_uuid = "noiSearch"."notice_of_intent_uuid"',
+      'decision.notice_of_intent_uuid = "noiSearch"."notice_of_intent_uuid" AND decision.is_draft = FALSE',
     );
     return query;
   }