diff --git a/apps/edr-freight-api/src/modules/bookings/booking-reference-data.service.ts b/apps/edr-freight-api/src/modules/bookings/booking-reference-data.service.ts
index dc4f292b7..8a2d52172 100644
--- a/apps/edr-freight-api/src/modules/bookings/booking-reference-data.service.ts
+++ b/apps/edr-freight-api/src/modules/bookings/booking-reference-data.service.ts
@@ -1,28 +1,28 @@
-import { Inject, Injectable } from '@nestjs/common';
-import { In, Not } from 'typeorm';
+import { Inject, Injectable } from "@nestjs/common";
+import { In, Not } from "typeorm";
 
-import { CargoType } from '../rule-engine/entities/cargo-type.entity';
-import { ContainerType } from '../rule-engine/entities/container-type.entity';
+import { CargoType } from "../rule-engine/entities/cargo-type.entity";
+import { ContainerType } from "../rule-engine/entities/container-type.entity";
 import {
   CARGO_TYPES_REPOSITORY,
   ICargoTypesRepository,
-} from '../rule-engine/interfaces/cargo-types.repository.interface';
+} from "../rule-engine/interfaces/cargo-types.repository.interface";
 import {
   CONTAINER_TYPES_REPOSITORY,
   IContainerTypesRepository,
-} from '../rule-engine/interfaces/container-types.repository.interface';
+} from "../rule-engine/interfaces/container-types.repository.interface";
 import {
   IServiceTypesRepository,
   SERVICE_TYPES_REPOSITORY,
-} from '../rule-engine/interfaces/service-types.repository.interface';
+} from "../rule-engine/interfaces/service-types.repository.interface";
 import {
   IShippingLinesRepository,
   SHIPPING_LINES_REPOSITORY,
-} from '../rule-engine/interfaces/shipping-lines.repository.interface';
+} from "../rule-engine/interfaces/shipping-lines.repository.interface";
 import {
   IYardsRepository,
   YARDS_REPOSITORY,
-} from '../rule-engine/interfaces/yards.repository.interface';
+} from "../rule-engine/interfaces/yards.repository.interface";
 import {
   BookingReferenceCargoTypeChildDto,
   BookingReferenceCargoTypeGroupDto,
@@ -32,9 +32,9 @@ import {
   BookingReferenceServiceDto,
   BookingReferenceShippingLineDto,
   BookingReferenceYardDto,
-} from './dto/booking-reference-data.dto';
+} from "./dto/booking-reference-data.dto";
 
-const LEGACY_YARD_CODES = ['LEGACY_ORIGIN', 'LEGACY_DEST'] as const;
+const LEGACY_YARD_CODES = ["LEGACY_ORIGIN", "LEGACY_DEST"] as const;
 
 export function buildCargoTypeTree(
   rows: CargoType[],
@@ -42,13 +42,16 @@ export function buildCargoTypeTree(
   const active = rows.filter((r) => r.isActive);
   const parents = active
     .filter((r) => !r.parentGroupId)
-    .sort((a, b) => a.displayOrder - b.displayOrder || a.code.localeCompare(b.code));
+    .sort(
+      (a, b) => a.displayOrder - b.displayOrder || a.code.localeCompare(b.code),
+    );
 
   return parents.map((parent) => {
     const children = active
       .filter((r) => r.parentGroupId === parent.id)
       .sort(
-        (a, b) => a.displayOrder - b.displayOrder || a.code.localeCompare(b.code),
+        (a, b) =>
+          a.displayOrder - b.displayOrder || a.code.localeCompare(b.code),
       )
       .map(
         (child): BookingReferenceCargoTypeChildDto => ({
@@ -79,14 +82,14 @@ export function groupContainersBySize(
 
   for (const ct of active) {
     const sizeKey =
-      ct.sizeFt != null && ct.sizeFt > 0 ? `${ct.sizeFt}ft` : 'other';
+      ct.sizeFt != null && ct.sizeFt > 0 ? `${ct.sizeFt}ft` : "other";
     const list = bySize.get(sizeKey) ?? [];
     list.push(ct);
     bySize.set(sizeKey, list);
   }
 
   const sortSizeKey = (key: string): number => {
-    if (key === 'other') return Number.MAX_SAFE_INTEGER;
+    if (key === "other") return Number.MAX_SAFE_INTEGER;
     const n = parseInt(key, 10);
     return Number.isNaN(n) ? Number.MAX_SAFE_INTEGER - 1 : n;
   };
@@ -126,7 +129,7 @@ export class BookingReferenceDataService {
     private readonly shippingLinesRepository: IShippingLinesRepository,
     @Inject(CARGO_TYPES_REPOSITORY)
     private readonly cargoTypesRepository: ICargoTypesRepository,
-  ) {}
+  ) { }
 
   async getReferenceData(): Promise<BookingReferenceDataDto> {
     const [yards, containerTypes, serviceTypes, shippingLines, cargoTypes] =
@@ -136,23 +139,23 @@ export class BookingReferenceDataService {
             isActive: true,
             code: Not(In([...LEGACY_YARD_CODES])),
           },
-          order: { displayOrder: 'ASC', code: 'ASC' },
+          order: { displayOrder: "ASC", code: "ASC" },
         }),
         this.containerTypesRepository.findAll({
           where: { isActive: true },
-          order: { displayOrder: 'ASC', code: 'ASC' },
+          order: { displayOrder: "ASC", code: "ASC" },
         }),
         this.serviceTypesRepository.findAll({
           where: { isActive: true },
-          order: { displayOrder: 'ASC', code: 'ASC' },
+          order: { displayOrder: "ASC", code: "ASC" },
         }),
         this.shippingLinesRepository.findAll({
           where: { isActive: true },
-          order: { label: 'ASC', code: 'ASC' },
+          order: { label: "ASC", code: "ASC" },
         }),
         this.cargoTypesRepository.findAll({
           where: { isActive: true },
-          order: { displayOrder: 'ASC', code: 'ASC' },
+          order: { displayOrder: "ASC", code: "ASC" },
         }),
       ]);
 
@@ -168,9 +171,8 @@ export class BookingReferenceDataService {
       containers: groupContainersBySize(containerTypes),
       service: serviceTypes.map(
         (s): BookingReferenceServiceDto => ({
-          id: s.id,
           name: s.serviceName,
-          code: s.code,
+          ...s,
         }),
       ),
       shipping_line: shippingLines.map(