From 93ff8c3378702ad0f51d145c07e9d3eb8fdfd9db Mon Sep 17 00:00:00 2001
From: Andreas Knuth <andreas.knuth@gmail.com>
Date: Tue, 5 Aug 2025 11:43:12 -0500
Subject: [PATCH] Issues 157,156,155

---
 .../src/listings/business-listing.service.ts  |   8 +-
 bizmatch-server/src/models/db.model.ts        |   5 +-
 bizmatch-server/src/models/main.model.ts      |   3 +-
 .../search-modal/search-modal.component.html  |  48 ++--
 .../search-modal/search-modal.component.ts    |  12 +-
 .../details-business-listing.component.ts     |  24 +-
 .../business-listings.component.html          |   2 +-
 .../edit-business-listing.component.html      | 268 +-----------------
 ...commercial-property-listing.component.html |   5 +-
 .../my-listing/my-listing.component.html      |  14 -
 bizmatch/src/app/utils/utils.ts               |   6 +-
 11 files changed, 64 insertions(+), 331 deletions(-)

diff --git a/bizmatch-server/src/listings/business-listing.service.ts b/bizmatch-server/src/listings/business-listing.service.ts
index a17f2c6..1390c3d 100644
--- a/bizmatch-server/src/listings/business-listing.service.ts
+++ b/bizmatch-server/src/listings/business-listing.service.ts
@@ -70,12 +70,8 @@ export class BusinessListingService {
       whereConditions.push(lte(sql`(${businesses_json.data}->>'employees')::integer`, criteria.maxNumberEmployees));
     }
 
-    if (criteria.establishedSince) {
-      whereConditions.push(gte(sql`(${businesses_json.data}->>'established')::integer`, criteria.establishedSince));
-    }
-
-    if (criteria.establishedUntil) {
-      whereConditions.push(lte(sql`(${businesses_json.data}->>'established')::integer`, criteria.establishedUntil));
+    if (criteria.establishedMin) {
+      whereConditions.push(gte(sql`(${businesses_json.data}->>'established')::integer`, criteria.establishedMin));
     }
 
     if (criteria.realEstateChecked) {
diff --git a/bizmatch-server/src/models/db.model.ts b/bizmatch-server/src/models/db.model.ts
index 16d7d3b..af2a956 100644
--- a/bizmatch-server/src/models/db.model.ts
+++ b/bizmatch-server/src/models/db.model.ts
@@ -277,9 +277,11 @@ export const BusinessListingSchema = z
     franchiseResale: z.boolean().optional().nullable(),
     salesRevenue: z.number().positive().nullable(),
     cashFlow: z.number().optional().nullable(),
+    ffe: z.number().optional().nullable(),
+    inventory: z.number().optional().nullable(),
     supportAndTraining: z.string().min(5).optional().nullable(),
     employees: z.number().int().positive().max(100000).optional().nullable(),
-    established: z.number().int().min(1800).max(2030).optional().nullable(),
+    established: z.number().int().min(1).max(250).optional().nullable(),
     internalListingNumber: z.number().int().positive().optional().nullable(),
     reasonForSale: z.string().min(5).optional().nullable(),
     brokerLicencing: z.string().optional().nullable(),
@@ -327,6 +329,7 @@ export const CommercialPropertyListingSchema = z
     price: z.number().positive(),
     favoritesForUser: z.array(z.string()),
     listingsCategory: ListingsCategoryEnum,
+    internalListingNumber: z.number().int().positive().optional().nullable(),
     draft: z.boolean(),
     imageOrder: z.array(z.string()),
     imagePath: z.string().nullable().optional(),
diff --git a/bizmatch-server/src/models/main.model.ts b/bizmatch-server/src/models/main.model.ts
index 51db50b..47de0ab 100644
--- a/bizmatch-server/src/models/main.model.ts
+++ b/bizmatch-server/src/models/main.model.ts
@@ -84,8 +84,7 @@ export interface BusinessListingCriteria extends ListCriteria {
   maxCashFlow: number;
   minNumberEmployees: number;
   maxNumberEmployees: number;
-  establishedSince: number;
-  establishedUntil: number;
+  establishedMin: number;
   realEstateChecked: boolean;
   leasedLocation: boolean;
   franchiseResale: boolean;
diff --git a/bizmatch/src/app/components/search-modal/search-modal.component.html b/bizmatch/src/app/components/search-modal/search-modal.component.html
index c110041..d7a5be3 100644
--- a/bizmatch/src/app/components/search-modal/search-modal.component.html
+++ b/bizmatch/src/app/components/search-modal/search-modal.component.html
@@ -39,6 +39,9 @@
           <span *ngIf="criteria.minCashFlow || criteria.maxCashFlow" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
             Cashflow: {{ criteria.minCashFlow || 'Any' }} - {{ criteria.maxCashFlow || 'Any' }} <button (click)="removeFilter('cashflow')" class="ml-1 text-red-500 hover:text-red-700">×</button>
           </span>
+          <span *ngIf="criteria.title" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
+            Title: {{ criteria.title }} <button (click)="removeFilter('title')" class="ml-1 text-red-500 hover:text-red-700">×</button>
+          </span>
           <span *ngIf="criteria.types.length" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
             Categories: {{ criteria.types.join(', ') }} <button (click)="removeFilter('types')" class="ml-1 text-red-500 hover:text-red-700">×</button>
           </span>
@@ -48,8 +51,8 @@
           <span *ngIf="criteria.minNumberEmployees || criteria.maxNumberEmployees" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
             Employees: {{ criteria.minNumberEmployees || 'Any' }} - {{ criteria.maxNumberEmployees || 'Any' }} <button (click)="removeFilter('employees')" class="ml-1 text-red-500 hover:text-red-700">×</button>
           </span>
-          <span *ngIf="criteria.establishedSince || criteria.establishedUntil" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
-            Established: {{ criteria.establishedSince || 'Any' }} - {{ criteria.establishedUntil || 'Any' }} <button (click)="removeFilter('established')" class="ml-1 text-red-500 hover:text-red-700">×</button>
+          <span *ngIf="criteria.establishedMin" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
+            Established: {{ criteria.establishedMin || 'Any' }} <button (click)="removeFilter('established')" class="ml-1 text-red-500 hover:text-red-700">×</button>
           </span>
           <span *ngIf="criteria.brokerName" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
             Broker: {{ criteria.brokerName }} <button (click)="removeFilter('brokerName')" class="ml-1 text-red-500 hover:text-red-700">×</button>
@@ -176,24 +179,15 @@
               </div>
             </div>
             <div>
-              <label for="establishedSince" class="block mb-2 text-sm font-medium text-gray-900">Established Since</label>
+              <label for="establishedMin" class="block mb-2 text-sm font-medium text-gray-900">Minimum years established</label>
               <div class="flex items-center space-x-2">
                 <input
                   type="number"
-                  id="establishedSince-From"
-                  [(ngModel)]="criteria.establishedSince"
+                  id="establishedMin"
+                  [(ngModel)]="criteria.establishedMin"
                   (ngModelChange)="debouncedSearch()"
                   class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-1/2 p-2.5"
-                  placeholder="YYYY"
-                />
-                <span>-</span>
-                <input
-                  type="number"
-                  id="establishedSince-To"
-                  [(ngModel)]="criteria.establishedUntil"
-                  (ngModelChange)="debouncedSearch()"
-                  class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-1/2 p-2.5"
-                  placeholder="YYYY"
+                  placeholder="YY"
                 />
               </div>
             </div>
@@ -243,6 +237,9 @@
     <span *ngIf="criteria.minCashFlow || criteria.maxCashFlow" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
       Cashflow: {{ criteria.minCashFlow || 'Any' }} - {{ criteria.maxCashFlow || 'Any' }} <button (click)="removeFilter('cashflow')" class="ml-1 text-red-500 hover:text-red-700">×</button>
     </span>
+    <span *ngIf="criteria.title" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
+      Title: {{ criteria.title }} <button (click)="removeFilter('title')" class="ml-1 text-red-500 hover:text-red-700">×</button>
+    </span>
     <span *ngIf="criteria.types.length" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
       Categories: {{ criteria.types.join(', ') }} <button (click)="removeFilter('types')" class="ml-1 text-red-500 hover:text-red-700">×</button>
     </span>
@@ -252,8 +249,8 @@
     <span *ngIf="criteria.minNumberEmployees || criteria.maxNumberEmployees" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
       Employees: {{ criteria.minNumberEmployees || 'Any' }} - {{ criteria.maxNumberEmployees || 'Any' }} <button (click)="removeFilter('employees')" class="ml-1 text-red-500 hover:text-red-700">×</button>
     </span>
-    <span *ngIf="criteria.establishedSince || criteria.establishedUntil" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
-      Established: {{ criteria.establishedSince || 'Any' }} - {{ criteria.establishedUntil || 'Any' }} <button (click)="removeFilter('established')" class="ml-1 text-red-500 hover:text-red-700">×</button>
+    <span *ngIf="criteria.establishedMin" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
+      Years established: {{ criteria.establishedMin || 'Any' }} <button (click)="removeFilter('established')" class="ml-1 text-red-500 hover:text-red-700">×</button>
     </span>
     <span *ngIf="criteria.brokerName" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
       Broker: {{ criteria.brokerName }} <button (click)="removeFilter('brokerName')" class="ml-1 text-red-500 hover:text-red-700">×</button>
@@ -380,24 +377,15 @@
       </div>
     </div>
     <div>
-      <label for="establishedSince" class="block mb-2 text-sm font-medium text-gray-900">Established Since</label>
+      <label for="establishedMin" class="block mb-2 text-sm font-medium text-gray-900">Minimum years established</label>
       <div class="flex items-center space-x-2">
         <input
           type="number"
-          id="establishedSince-From"
-          [(ngModel)]="criteria.establishedSince"
+          id="establishedMin"
+          [(ngModel)]="criteria.establishedMin"
           (ngModelChange)="debouncedSearch()"
           class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-1/2 p-2.5"
-          placeholder="YYYY"
-        />
-        <span>-</span>
-        <input
-          type="number"
-          id="establishedSince-To"
-          [(ngModel)]="criteria.establishedUntil"
-          (ngModelChange)="debouncedSearch()"
-          class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-1/2 p-2.5"
-          placeholder="YYYY"
+          placeholder="YY"
         />
       </div>
     </div>
diff --git a/bizmatch/src/app/components/search-modal/search-modal.component.ts b/bizmatch/src/app/components/search-modal/search-modal.component.ts
index be46a2a..ac9496f 100644
--- a/bizmatch/src/app/components/search-modal/search-modal.component.ts
+++ b/bizmatch/src/app/components/search-modal/search-modal.component.ts
@@ -89,9 +89,9 @@ export class SearchModalComponent {
       this.selectedPropertyType ||
       this.criteria.minNumberEmployees ||
       this.criteria.maxNumberEmployees ||
-      this.criteria.establishedSince ||
-      this.criteria.establishedUntil ||
-      this.criteria.brokerName
+      this.criteria.establishedMin ||
+      this.criteria.brokerName ||
+      this.criteria.title
     );
   }
   removeFilter(filterType: string) {
@@ -131,12 +131,14 @@ export class SearchModalComponent {
         this.criteria.maxNumberEmployees = null;
         break;
       case 'established':
-        this.criteria.establishedSince = null;
-        this.criteria.establishedUntil = null;
+        this.criteria.establishedMin = null;
         break;
       case 'brokerName':
         this.criteria.brokerName = null;
         break;
+      case 'title':
+        this.criteria.title = null;
+        break;
     }
     this.searchService.search(this.criteria);
   }
diff --git a/bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.ts b/bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.ts
index f205a37..90ea8e5 100644
--- a/bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.ts
+++ b/bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.ts
@@ -150,12 +150,28 @@ export class DetailsBusinessListingComponent extends BaseDetailsComponent {
     const result = [
       { label: 'Category', value: this.selectOptions.getBusiness(this.listing.type) },
       { label: 'Located in', value: `${this.listing.location.name ? this.listing.location.name : this.listing.location.county}, ${this.selectOptions.getState(this.listing.location.state)}` },
-      { label: 'Asking Price', value: `${this.listing.price ? `$${this.listing.price.toLocaleString()}` : ''}` },
-      { label: 'Sales revenue', value: `${this.listing.salesRevenue ? `$${this.listing.salesRevenue.toLocaleString()}` : ''}` },
-      { label: 'Cash flow', value: `${this.listing.cashFlow ? `$${this.listing.cashFlow.toLocaleString()}` : ''}` },
+      { label: 'Asking Price', value: `${this.listing.price ? `$${this.listing.price.toLocaleString()}` : 'undisclosed '}` },
+      { label: 'Sales revenue', value: `${this.listing.salesRevenue ? `$${this.listing.salesRevenue.toLocaleString()}` : 'undisclosed '}` },
+      { label: 'Cash flow', value: `${this.listing.cashFlow ? `$${this.listing.cashFlow.toLocaleString()}` : 'undisclosed '}` },
+      ...(this.listing.ffe
+        ? [
+            {
+              label: 'Furniture, Fixtures / Equipment Value (FFE)',
+              value: `$${this.listing.ffe.toLocaleString()}`,
+            },
+          ]
+        : []),
+      ...(this.listing.inventory
+        ? [
+            {
+              label: 'Inventory at Cost Value',
+              value: `$${this.listing.inventory.toLocaleString()}`,
+            },
+          ]
+        : []),
       { label: 'Type of Real Estate', value: typeOfRealEstate },
       { label: 'Employees', value: this.listing.employees },
-      { label: 'Established since', value: this.listing.established },
+      { label: 'Years established', value: this.listing.established },
       { label: 'Support & Training', value: this.listing.supportAndTraining },
       { label: 'Reason for Sale', value: this.listing.reasonForSale },
       { label: 'Broker licensing', value: this.listing.brokerLicencing },
diff --git a/bizmatch/src/app/pages/listings/business-listings/business-listings.component.html b/bizmatch/src/app/pages/listings/business-listings/business-listings.component.html
index 8e3a812..0d69647 100644
--- a/bizmatch/src/app/pages/listings/business-listings/business-listings.component.html
+++ b/bizmatch/src/app/pages/listings/business-listings/business-listings.component.html
@@ -36,7 +36,7 @@
             <p class="text-sm text-gray-600 mb-2"><strong>Sales revenue:</strong> {{ listing.salesRevenue | currency : 'USD' : 'symbol' : '1.0-0' }}</p>
             <p class="text-sm text-gray-600 mb-2"><strong>Net profit:</strong> {{ listing.cashFlow | currency : 'USD' : 'symbol' : '1.0-0' }}</p>
             <p class="text-sm text-gray-600 mb-2"><strong>Location:</strong> {{ listing.location.name ? listing.location.name : listing.location.county }}</p>
-            <p class="text-sm text-gray-600 mb-4"><strong>Established:</strong> {{ listing.established }}</p>
+            <p class="text-sm text-gray-600 mb-4"><strong>Years established:</strong> {{ listing.established }}</p>
             <img src="{{ env.imageBaseUrl }}/pictures/logo/{{ listing.imageName }}.avif?_ts={{ ts }}" alt="Company logo" class="absolute bottom-[80px] right-[20px] h-[45px] w-auto" />
             <div class="flex-grow"></div>
             <button
diff --git a/bizmatch/src/app/pages/subscription/edit-business-listing/edit-business-listing.component.html b/bizmatch/src/app/pages/subscription/edit-business-listing/edit-business-listing.component.html
index 029a91b..da565c2 100644
--- a/bizmatch/src/app/pages/subscription/edit-business-listing/edit-business-listing.component.html
+++ b/bizmatch/src/app/pages/subscription/edit-business-listing/edit-business-listing.component.html
@@ -17,107 +17,35 @@
         </ng-select>
       </div>
 
-      <!-- <div class="mb-4">
-        <label for="title" class="block text-sm font-bold text-gray-700 mb-1">Title of Listing</label>
-        <input type="text" id="title" [(ngModel)]="listing.title" name="title" class="w-full p-2 border border-gray-300 rounded-md" />
-      </div> -->
       <div>
         <app-validated-input label="Title of Listing" name="title" [(ngModel)]="listing.title"></app-validated-input>
       </div>
 
-      <!-- <div class="mb-4">
-        <label for="description" class="block text-sm font-bold text-gray-700 mb-1">Description</label>
-        <quill-editor [(ngModel)]="listing.description" name="description" [modules]="quillModules"></quill-editor>
-      </div> -->
       <div>
         <app-validated-quill label="Description" name="description" [(ngModel)]="listing.description"></app-validated-quill>
       </div>
 
-      <!-- <div class="mb-4">
-        <label for="type" class="block text-sm font-bold text-gray-700 mb-1">Type of business</label>
-        <ng-select [items]="typesOfBusiness" bindLabel="name" bindValue="value" [(ngModel)]="listing.type" name="type"> </ng-select>
-      </div> -->
       <div>
         <app-validated-ng-select label="Type of business" name="type" [(ngModel)]="listing.type" [items]="typesOfBusiness"></app-validated-ng-select>
       </div>
 
-      <!-- <div class="flex mb-4 space-x-4">
-        <div class="w-1/2">
-          <label for="state" class="block text-sm font-bold text-gray-700 mb-1">State</label>
-          <ng-select [items]="selectOptions?.states" bindLabel="name" bindValue="value" [(ngModel)]="listing.state" name="state"> </ng-select>
-        </div>
-        <div class="w-1/2">
-          <label for="city" class="block text-sm font-bold text-gray-700 mb-1">City</label>
-          <input type="text" id="city" [(ngModel)]="listing.city" name="city" class="w-full p-2 border border-gray-300 rounded-md" />
-        </div>
-      </div> -->
       <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-        <!-- <app-validated-ng-select label="State" name="state" [(ngModel)]="listing.location.state" [items]="selectOptions?.states"></app-validated-ng-select>
-        <app-validated-input label="City" name="city" [(ngModel)]="listing.location.city"></app-validated-input> -->
-        <!-- <app-validated-city label="Location" name="location" [(ngModel)]="listing.location"></app-validated-city> -->
         <app-validated-location label="Location" name="location" [(ngModel)]="listing.location"></app-validated-location>
         <app-validated-price label="Price" name="price" [(ngModel)]="listing.price"></app-validated-price>
       </div>
 
-      <!-- <div class="flex mb-4 space-x-4">
-        <div class="w-1/2">
-          <label for="price" class="block text-sm font-bold text-gray-700 mb-1">Price</label>
-          <input
-            type="text"
-            id="price"
-            [(ngModel)]="listing.price"
-            name="price"
-            class="w-full p-2 border border-gray-300 rounded-md"
-            [options]="{ prefix: '$', thousands: ',', decimal: '.', precision: 0, align: 'left' }"
-            currencyMask
-          />
-        </div>
-        <div class="w-1/2">
-          <label for="salesRevenue" class="block text-sm font-bold text-gray-700 mb-1">Sales Revenue</label>
-          <input
-            type="text"
-            id="salesRevenue"
-            [(ngModel)]="listing.salesRevenue"
-            name="salesRevenue"
-            class="w-full p-2 border border-gray-300 rounded-md"
-            [options]="{ prefix: '$', thousands: ',', decimal: '.', precision: 0, align: 'left' }"
-            currencyMask
-          />
-        </div>
-      </div> -->
       <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
         <app-validated-price label="Sales Revenue" name="salesRevenue" [(ngModel)]="listing.salesRevenue"></app-validated-price>
         <app-validated-price label="Cash Flow" name="cashFlow" [(ngModel)]="listing.cashFlow"></app-validated-price>
       </div>
 
-      <!-- <div class="mb-4">
-        <label for="cashFlow" class="block text-sm font-bold text-gray-700 mb-1">Cash Flow</label>
-        <input
-          type="text"
-          id="cashFlow"
-          [(ngModel)]="listing.cashFlow"
-          name="cashFlow"
-          class="w-full p-2 border border-gray-300 rounded-md"
-          [options]="{ prefix: '$', thousands: ',', decimal: '.', precision: 0, align: 'left' }"
-          currencyMask
-        />
-      </div> -->
-      <!-- <div>
-        
-      </div> -->
-
-      <!-- <div class="flex mb-4 space-x-4">
-        <div class="w-1/2">
-          <label for="established" class="block text-sm font-bold text-gray-700 mb-1">Years Established Since</label>
-          <input type="number" id="established" [(ngModel)]="listing.established" name="established" class="w-full p-2 border border-gray-300 rounded-md" />
-        </div>
-        <div class="w-1/2">
-          <label for="employees" class="block text-sm font-bold text-gray-700 mb-1">Employees</label>
-          <input type="number" id="employees" [(ngModel)]="listing.employees" name="employees" class="w-full p-2 border border-gray-300 rounded-md" />
-        </div>
-      </div> -->
       <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-        <app-validated-input label="Established In" name="established" [(ngModel)]="listing.established" mask="0000" kind="number"></app-validated-input>
+        <app-validated-price label="Furniture, Fixtures / Equipment Value (FFE)" name="ffe" [(ngModel)]="listing.ffe"></app-validated-price>
+        <app-validated-price label="Inventory at Cost Value" name="inventory" [(ngModel)]="listing.inventory"></app-validated-price>
+      </div>
+
+      <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+        <app-validated-input label="Years established" name="established" [(ngModel)]="listing.established" mask="0000" kind="number"></app-validated-input>
         <app-validated-input label="Employees" name="employees" [(ngModel)]="listing.employees" mask="0000" kind="number"></app-validated-input>
       </div>
 
@@ -157,48 +85,23 @@
         </div>
       </div>
 
-      <!-- <div class="mb-4">
-        <label for="supportAndTraining" class="block text-sm font-bold text-gray-700 mb-1">Support & Training</label>
-        <input type="text" id="supportAndTraining" [(ngModel)]="listing.supportAndTraining" name="supportAndTraining" class="w-full p-2 border border-gray-300 rounded-md" />
-      </div> 
-      <div class="mb-4">
-        <label for="reasonForSale" class="block text-sm font-bold text-gray-700 mb-1">Reason for Sale</label>
-        <input type="text" id="reasonForSale" [(ngModel)]="listing.reasonForSale" name="reasonForSale" class="w-full p-2 border border-gray-300 rounded-md" />
-      </div>-->
       <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
         <app-validated-input label="Support & Training" name="supportAndTraining" [(ngModel)]="listing.supportAndTraining"></app-validated-input>
         <app-validated-input label="Reason for Sale" name="reasonForSale" [(ngModel)]="listing.reasonForSale"></app-validated-input>
       </div>
 
-      <!-- <div class="flex mb-4 space-x-4">
-        <div class="w-1/2">
-          <label for="brokerLicencing" class="block text-sm font-bold text-gray-700 mb-1">Broker Licensing</label>
-          <input type="text" id="brokerLicencing" [(ngModel)]="listing.brokerLicencing" name="brokerLicencing" class="w-full p-2 border border-gray-300 rounded-md" />
-        </div>
-        <div class="w-1/2">
-          <label for="internalListingNumber" class="block text-sm font-bold text-gray-700 mb-1">Internal Listing Number</label>
-          <input type="number" id="internalListingNumber" [(ngModel)]="listing.internalListingNumber" name="internalListingNumber" class="w-full p-2 border border-gray-300 rounded-md" />
-        </div>
-      </div> -->
       <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
         <div>
-          <!-- <app-validated-input label="Broker Licensing" name="brokerLicencing" [(ngModel)]="listing.brokerLicencing"></app-validated-input> -->
           <label for="brokerLicencing" class="block text-sm font-bold text-gray-700 mb-1">Broker Licensing (please maintain your license in your account)</label>
-          <!-- @if(listingUser){ -->
           <ng-select [(ngModel)]="listing.brokerLicencing" name="brokerLicencing">
             @for (licensedIn of listingUser?.licensedIn; track listingUser?.licensedIn) {
             <ng-option [value]="licensedIn.registerNo">{{ licensedIn.state }} {{ licensedIn.registerNo }}</ng-option>
             }
           </ng-select>
         </div>
-        <!-- } -->
         <app-validated-input label="Internal Listing Number" name="internalListingNumber" [(ngModel)]="listing.internalListingNumber" kind="number" mask="00000000000000000000"></app-validated-input>
       </div>
 
-      <!-- <div class="mb-4">
-        <label for="internals" class="block text-sm font-bold text-gray-700 mb-1">Internal Notes (Will not be shown on the listing, for your records only.)</label>
-        <textarea id="internals" [(ngModel)]="listing.internals" name="internals" class="w-full p-2 border border-gray-300 rounded-md" rows="3"></textarea>
-      </div> -->
       <div>
         <app-validated-textarea label="Internal Notes (Will not be shown on the listing, for your records only.)" name="internals" [(ngModel)]="listing.internals"></app-validated-textarea>
       </div>
@@ -221,162 +124,3 @@
     }
   </div>
 </div>
-
-<!-- <div class="surface-ground px-4 py-8 md:px-6 lg:px-8">
-  <div class="p-fluid flex flex-column lg:flex-row">
-    <menu-account></menu-account>
-    <p-toast></p-toast>
-    <div *ngIf="listing" class="surface-card p-5 shadow-2 border-round flex-auto">
-      <div class="text-900 font-semibold text-lg mt-3">{{ mode === 'create' ? 'New' : 'Edit' }} Listing</div>
-      <p-divider></p-divider>
-      <div class="flex gap-5 flex-column-reverse md:flex-row">
-        <div class="flex-auto p-fluid">
-          <div class="mb-4">
-            <label for="listingCategory" class="block font-medium text-900 mb-2">Listing category</label>
-            <p-dropdown
-              id="listingCategory"
-              [options]="selectOptions?.listingCategories"
-              [ngModel]="listingsCategory"
-              optionLabel="name"
-              optionValue="value"
-              (ngModelChange)="changeListingCategory($event)"
-              placeholder="Listing category"
-              [disabled]="mode === 'edit'"
-              [style]="{ width: '100%' }"
-            ></p-dropdown>
-          </div>
-          <div class="mb-4">
-            <label for="email" class="block font-medium text-900 mb-2">Title of Listing</label>
-            <input id="email" type="text" pInputText [(ngModel)]="listing.title" />
-          </div>
-          <div>
-            <div class="mb-4">
-              <label for="description" class="block font-medium text-900 mb-2">Description</label>
-              <p-editor [(ngModel)]="listing.description" [style]="{ height: '320px' }" [modules]="editorModules">
-                <ng-template pTemplate="header"></ng-template>
-              </p-editor>
-            </div>
-          </div>
-          <div class="mb-4">
-            <label for="type" class="block font-medium text-900 mb-2">Type of business</label>
-            <p-dropdown
-              id="type"
-              [filter]="true"
-              filterBy="name"
-              [options]="typesOfBusiness"
-              [(ngModel)]="listing.type"
-              optionLabel="name"
-              optionValue="value"
-              [showClear]="true"
-              placeholder="Type of business"
-              [style]="{ width: '100%' }"
-            ></p-dropdown>
-          </div>
-          <div class="grid">
-            <div class="mb-4 col-12 md:col-6">
-              <label for="listingCategory" class="block font-medium text-900 mb-2">State</label>
-              <p-dropdown
-                id="listingCategory"
-                [filter]="true"
-                filterBy="name"
-                [options]="selectOptions?.states"
-                [(ngModel)]="listing.state"
-                optionLabel="name"
-                optionValue="value"
-                [showClear]="true"
-                placeholder="State"
-                [style]="{ width: '100%' }"
-              ></p-dropdown>
-            </div>
-            <div class="mb-4 col-12 md:col-6">
-              <label for="listingCategory" class="block font-medium text-900 mb-2">City</label>
-              <p-autoComplete [(ngModel)]="listing.city" [suggestions]="suggestions" (completeMethod)="search($event)"></p-autoComplete>
-            </div>
-          </div>
-        </div>
-      </div>
-      <p-divider></p-divider>
-      <div class="flex gap-5 flex-column-reverse md:flex-row">
-        <div class="flex-auto p-fluid">
-          <div class="grid">
-            <div class="mb-4 col-12 md:col-6">
-              <label for="price" class="block font-medium text-900 mb-2">Price</label>
-              <p-inputNumber mode="currency" currency="USD" locale="en-US" inputId="price" [(ngModel)]="listing.price"></p-inputNumber>
-            </div>
-            <div class="mb-4 col-12 md:col-6">
-              <label for="salesRevenue" class="block font-medium text-900 mb-2">Sales Revenue</label>
-              <p-inputNumber mode="currency" currency="USD" inputId="salesRevenue" [(ngModel)]="listing.salesRevenue"></p-inputNumber>
-            </div>
-          </div>
-          <div class="grid">
-            <div class="mb-4 col-12 md:col-6">
-              <label for="cashFlow" class="block font-medium text-900 mb-2">Cash Flow</label>
-              <p-inputNumber mode="currency" currency="USD" inputId="cashFlow" [(ngModel)]="listing.cashFlow"></p-inputNumber>
-            </div>
-          </div>
-          <div class="grid">
-            <div class="mb-4 col-12 md:col-6">
-              <label for="established" class="block font-medium text-900 mb-2">Years Established Since</label>
-              <p-inputNumber mode="decimal" inputId="established" [(ngModel)]="listing.established" [useGrouping]="false"></p-inputNumber>
-            </div>
-            <div class="mb-4 col-12 md:col-6">
-              <label for="employees" class="block font-medium text-900 mb-2">Employees</label>
-              <p-inputNumber mode="decimal" inputId="employees" [(ngModel)]="listing.employees" [useGrouping]="false"></p-inputNumber>
-            </div>
-          </div>
-          <div class="grid">
-            <div class="mb-4 col-12 md:col-4">
-              <p-checkbox [binary]="true" [(ngModel)]="listing.realEstateIncluded"></p-checkbox>
-              <span class="ml-2 text-900">Real Estate Included</span>
-            </div>
-            <div class="mb-4 col-12 md:col-4">
-              <p-checkbox [binary]="true" [(ngModel)]="listing.leasedLocation"></p-checkbox>
-              <span class="ml-2 text-900">Leased Location</span>
-            </div>
-            <div class="mb-4 col-12 md:col-4">
-              <p-checkbox [binary]="true" [(ngModel)]="listing.franchiseResale"></p-checkbox>
-              <span class="ml-2 text-900">Franchise Re-Sale</span>
-            </div>
-          </div>
-          <div class="mb-4">
-            <label for="supportAndTraining" class="block font-medium text-900 mb-2">Support & Training</label>
-            <input id="supportAndTraining" type="text" pInputText [(ngModel)]="listing.supportAndTraining" />
-          </div>
-          <div class="mb-4">
-            <label for="reasonForSale" class="block font-medium text-900 mb-2">Reason for Sale</label>
-            <textarea id="reasonForSale" type="text" pInputTextarea rows="5" [autoResize]="true" [(ngModel)]="listing.reasonForSale"></textarea>
-          </div>
-          <div class="grid">
-            <div class="mb-4 col-12 md:col-6">
-              <label for="brokerLicensing" class="block font-medium text-900 mb-2">Broker Licensing</label>
-              <input id="brokerLicensing" type="text" pInputText [(ngModel)]="listing.brokerLicencing" />
-            </div>
-            <div class="mb-4 col-12 md:col-6">
-              <label for="internalListingNumber" class="block font-medium text-900 mb-2">Internal Listing Number</label>
-              <p-inputNumber mode="decimal" inputId="internalListingNumber" type="text" [(ngModel)]="listing.internalListingNumber" [useGrouping]="false"></p-inputNumber>
-            </div>
-          </div>
-          <div class="mb-4">
-            <label for="internalListing" class="block font-medium text-900 mb-2">Internal Notes (Will not be shown on the listing, for your records only.)</label>
-            <input id="internalListing" type="text" pInputText [(ngModel)]="listing.internals" />
-          </div>
-          <div class="grid">
-            <div class="mb-4 col-12 md:col-6">
-              <p-inputSwitch inputId="draft" [(ngModel)]="listing.draft"></p-inputSwitch>
-              <span class="ml-2 text-900 absolute translate-y-5">Draft Mode (Will not be shown as public listing)</span>
-            </div>
-          </div>
-          <div>
-            @if (mode==='create'){
-            <button pButton pRipple label="Post Listing" class="w-auto" (click)="save()"></button>
-            } @else {
-            <button pButton pRipple label="Update Listing" class="w-auto" (click)="save()"></button>
-            }
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-<p-toast></p-toast>
-<p-confirmDialog></p-confirmDialog> -->
diff --git a/bizmatch/src/app/pages/subscription/edit-commercial-property-listing/edit-commercial-property-listing.component.html b/bizmatch/src/app/pages/subscription/edit-commercial-property-listing/edit-commercial-property-listing.component.html
index d8e705b..3c8ddf4 100644
--- a/bizmatch/src/app/pages/subscription/edit-commercial-property-listing/edit-commercial-property-listing.component.html
+++ b/bizmatch/src/app/pages/subscription/edit-commercial-property-listing/edit-commercial-property-listing.component.html
@@ -32,6 +32,9 @@
       </div>
       <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
         <app-validated-price label="Price" name="price" [(ngModel)]="listing.price"></app-validated-price>
+        <app-validated-input label="Internal Listing Number" name="internalListingNumber" [(ngModel)]="listing.internalListingNumber" kind="number" mask="00000000000000000000"></app-validated-input>
+      </div>
+      <div class="container mx-auto pt-2">
         <div class="flex justify-center">
           <label class="flex items-center cursor-pointer">
             <div class="relative">
@@ -42,10 +45,8 @@
           </label>
         </div>
       </div>
-
       <div class="container mx-auto pt-2">
         <app-drag-drop-mixed [listing]="listing" [ts]="ts" (imageOrderChanged)="imageOrderChanged($event)" (imageToDelete)="deleteConfirm($event)"></app-drag-drop-mixed>
-        <!-- </div> -->
       </div>
 
       <div class="bg-white px-4 pb-4 rounded-lg shadow">
diff --git a/bizmatch/src/app/pages/subscription/my-listing/my-listing.component.html b/bizmatch/src/app/pages/subscription/my-listing/my-listing.component.html
index 41678a3..f896f78 100644
--- a/bizmatch/src/app/pages/subscription/my-listing/my-listing.component.html
+++ b/bizmatch/src/app/pages/subscription/my-listing/my-listing.component.html
@@ -94,20 +94,6 @@
         </div>
       </div>
     </div>
-
-    <!-- <div class="flex items-center justify-between mt-4">
-      <p class="text-sm text-gray-600">Showing 1 to 2 of 2 entries</p>
-      <div class="flex items-center">
-        <button class="px-2 py-1 border rounded-l-md bg-gray-100">&lt;&lt;</button>
-        <button class="px-2 py-1 border-t border-b bg-gray-100">&lt;</button>
-        <button class="px-2 py-1 border bg-blue-500 text-white">1</button>
-        <button class="px-2 py-1 border-t border-b bg-gray-100">&gt;</button>
-        <button class="px-2 py-1 border rounded-r-md bg-gray-100">&gt;&gt;</button>
-        <select class="ml-2 border rounded-md px-2 py-1">
-          <option>10</option>
-        </select>
-      </div>
-    </div> -->
   </div>
 </div>
 <app-confirmation></app-confirmation>
diff --git a/bizmatch/src/app/utils/utils.ts b/bizmatch/src/app/utils/utils.ts
index 1e9be9c..9f6daa0 100644
--- a/bizmatch/src/app/utils/utils.ts
+++ b/bizmatch/src/app/utils/utils.ts
@@ -25,8 +25,7 @@ export function createEmptyBusinessListingCriteria(): BusinessListingCriteria {
     maxCashFlow: null,
     minNumberEmployees: null,
     maxNumberEmployees: null,
-    establishedSince: null,
-    establishedUntil: null,
+    establishedMin: null,
     realEstateChecked: false,
     leasedLocation: false,
     franchiseResale: false,
@@ -93,8 +92,7 @@ export function resetBusinessListingCriteria(criteria: BusinessListingCriteria)
   criteria.maxCashFlow = null;
   criteria.minNumberEmployees = null;
   criteria.maxNumberEmployees = null;
-  criteria.establishedSince = null;
-  criteria.establishedUntil = null;
+  criteria.establishedMin = null;
   criteria.realEstateChecked = false;
   criteria.leasedLocation = false;
   criteria.franchiseResale = false;