diff --git a/Modules/Company/Resources/views/show.blade.php b/Modules/Company/Resources/views/show.blade.php
index 6419d3f8..1de8336e 100755
--- a/Modules/Company/Resources/views/show.blade.php
+++ b/Modules/Company/Resources/views/show.blade.php
@@ -215,7 +215,7 @@
                             </div>
                             <form method="POST" action="{{ route('platform.companies.warehouses.division.update', [$company, $warehouse]) }}" class="contents">
                                 @csrf @method('PUT')
-                                <select aria-label="Division assignment" name="division_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
+                                <select aria-label="Company-level warehouse" name="division_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
                                     <option value="">Company-level warehouse</option>
                                     @foreach($company->divisions as $divisionOption)
                                         <option value="{{ $divisionOption->id }}" @selected($warehouse->division_id === $divisionOption->id)>{{ $divisionOption->name }}</option>
@@ -253,7 +253,7 @@
 
                         <div class="grid gap-4 md:grid-cols-4 md:items-end">
                             <div>
-                                <label for="division_name" class="block text-xs font-bold uppercase tracking-wide text-zinc-500 dark:text-zinc-400">Division name</label>
+                                <label for="sonar-input-47ea6fa2d4" class="block text-xs font-bold uppercase tracking-wide text-zinc-500 dark:text-zinc-400">Division name</label>
                                 <input name="name" value="{{ $division->name }}" class="mt-2 h-12 w-full rounded-xl border-zinc-300 bg-white px-4 text-sm font-medium text-zinc-900 shadow-sm outline-none transition focus:border-blue-500 focus:ring-2 focus:ring-blue-500/30 dark:border-zinc-700 dark:bg-zinc-950 dark:text-white" required id="division_name">
                             </div>
 
@@ -275,8 +275,8 @@
                         </div>
 
                         <div>
-                            <label for="division_description" class="block text-xs font-bold uppercase tracking-wide text-zinc-500 dark:text-zinc-400">Description</label>
-                            <textarea id="division_description" name="description" rows="3" class="mt-2 w-full rounded-xl border-zinc-300 bg-white px-4 py-3 text-sm font-medium text-zinc-900 shadow-sm outline-none transition focus:border-blue-500 focus:ring-2 focus:ring-blue-500/30 dark:border-zinc-700 dark:bg-zinc-950 dark:text-white">{{ $division->description }}</textarea>
+                            <label class="block text-xs font-bold uppercase tracking-wide text-zinc-500 dark:text-zinc-400">Description</label>
+                            <textarea aria-label="Description" name="description" rows="3" class="mt-2 w-full rounded-xl border-zinc-300 bg-white px-4 py-3 text-sm font-medium text-zinc-900 shadow-sm outline-none transition focus:border-blue-500 focus:ring-2 focus:ring-blue-500/30 dark:border-zinc-700 dark:bg-zinc-950 dark:text-white">{{ $division->description }}</textarea>
                         </div>
                     </form>
                     <div class="mt-6"><h4 class="font-semibold">Division address</h4><form method="POST" action="{{ route('platform.companies.divisions.address.update', [$company, $division]) }}" class="mt-4">@csrf @method('PUT')@include('company::partials.address-form', ['address' => $division->address, 'defaultLabel' => 'Operating address'])</form></div>
diff --git a/Modules/Documentation/Resources/views/documents/index.blade.php b/Modules/Documentation/Resources/views/documents/index.blade.php
index dfcb24f4..d791acc0 100755
--- a/Modules/Documentation/Resources/views/documents/index.blade.php
+++ b/Modules/Documentation/Resources/views/documents/index.blade.php
@@ -47,13 +47,13 @@
                     <label for="sonar-input-9f8539cc9d" class="visually-hidden">Search title, reference, summary or body</label>
 <input class="doc-input" name="search" value="{{ request('search') }}"
                         placeholder="Search title, reference, summary or body" id="sonar-input-9f8539cc9d">
-                    <select aria-label="Filter by status" class="doc-select" name="status">
+                    <select aria-label="All statuses" class="doc-select" name="status">
                         <option value="">All statuses</option>
                         @foreach ($statuses as $value => $label)
                             <option value="{{ $value }}" @selected(request('status') === $value)>{{ $label }}</option>
                         @endforeach
                     </select>
-                    <select aria-label="Filter by category" class="doc-select" name="category">
+                    <select aria-label="All categories" class="doc-select" name="category">
                         <option value="">All categories</option>
                         @foreach ($categories as $category)
                             <option value="{{ $category->id }}" @selected((string) request('category') === (string) $category->id)>{{ $category->name }}
diff --git a/Modules/Helpdesk/Resources/views/components/colour-select.blade.php b/Modules/Helpdesk/Resources/views/components/colour-select.blade.php
index 269fd4bd..08fa8bba 100755
--- a/Modules/Helpdesk/Resources/views/components/colour-select.blade.php
+++ b/Modules/Helpdesk/Resources/views/components/colour-select.blade.php
@@ -14,12 +14,12 @@
 <div {{ $attributes->class('rounded-xl border border-zinc-200 bg-white p-3 shadow-sm dark:border-zinc-700 dark:bg-zinc-950/50') }}>
     <div class="grid gap-3 lg:grid-cols-[minmax(0,1fr)_auto] lg:items-end">
         <div class="min-w-0 space-y-2">
-            <label for="colour-select-{{ md5($model) }}" class="block text-xs font-bold uppercase tracking-wide text-zinc-600 dark:text-zinc-300">
+            <label class="block text-xs font-bold uppercase tracking-wide text-zinc-600 dark:text-zinc-300">
                 {{ $label }}
             </label>
 
             <div class="grid gap-2 sm:grid-cols-[minmax(0,1fr)_auto] sm:items-center">
-                <select id="colour-select-{{ md5($model) }}" aria-label="{{ $label }}"
+                <select aria-label="Colour"
                     wire:model.live="{{ $model }}"
                     class="h-9 w-full rounded-lg border border-zinc-300 bg-white px-3 text-sm font-semibold text-zinc-900 shadow-sm outline-none transition-colors duration-150 focus:border-blue-500 focus:ring-2 focus:ring-blue-500/30 dark:border-zinc-700 dark:bg-zinc-900 dark:text-zinc-100"
                 >
diff --git a/Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php b/Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php
index 3a6dd023..4f7a2bd0 100755
--- a/Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php
+++ b/Modules/Helpdesk/Resources/views/livewire/kanban-board.blade.php
@@ -59,7 +59,7 @@
             <div class="hd-select-wrap shrink-0 md:w-72">
                 <select
                     class="hd-select"
-                    aria-label="Select Kanban board"
+                    aria-label="Kanban board"
                     onchange="window.location.href = '{{ route('helpdesk.kanban') }}?board_id=' + encodeURIComponent(this.value)"
                 >
                     @foreach ($boards as $availableBoard)
diff --git a/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php b/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php
index 49697204..a7f36f42 100755
--- a/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php
+++ b/Modules/Helpdesk/Resources/views/livewire/ticket-show.blade.php
@@ -486,7 +486,7 @@
                                  class="prose prose-sm min-h-[12rem] max-w-none bg-white p-4 text-sm leading-6 text-zinc-900 outline-none dark:prose-invert dark:bg-zinc-950 dark:text-zinc-100"
                                  data-placeholder="Write a public reply or internal note. Right-click or Ctrl-click underlined words for spelling suggestions.">{!! $oldCommentBody !!}</div>
 
-                            <textarea aria-label="Ticket Comment Body" id="ticket-comment-body" name="commentBody" required spellcheck="true" lang="en-GB" autocorrect="on" autocomplete="on" autocapitalize="sentences" inputmode="text" class="sr-only" tabindex="-1" aria-hidden="true">{{ $oldCommentBody }}</textarea>
+                            <textarea aria-label="Comment" id="ticket-comment-body" name="commentBody" required spellcheck="true" lang="en-GB" autocorrect="on" autocomplete="on" autocapitalize="sentences" inputmode="text" class="sr-only" tabindex="-1" aria-hidden="true">{{ $oldCommentBody }}</textarea>
                         </div>
 
                         <p class="mt-2 flex items-center gap-2 text-xs font-medium text-zinc-500 dark:text-zinc-400">
diff --git a/Modules/Helpdesk/Resources/views/partials/time-log-form.blade.php b/Modules/Helpdesk/Resources/views/partials/time-log-form.blade.php
index fb04e345..689a9000 100755
--- a/Modules/Helpdesk/Resources/views/partials/time-log-form.blade.php
+++ b/Modules/Helpdesk/Resources/views/partials/time-log-form.blade.php
@@ -18,7 +18,7 @@
         </button>
     </div>
 
-    <textarea aria-label="Description" spellcheck="true" lang="en-GB" name="description" rows="2" placeholder="Optional work note"
+    <textarea aria-label="Optional work note" spellcheck="true" lang="en-GB" name="description" rows="2" placeholder="Optional work note"
         class="block w-full rounded-lg border border-zinc-300 bg-white p-2 text-xs font-semibold text-zinc-900 shadow-sm focus:border-emerald-500 focus:ring-emerald-500 dark:border-zinc-700 dark:bg-zinc-950 dark:text-zinc-100"
         data-dusk="ticket-time-description">{{ old('description') }}</textarea>
 
diff --git a/Modules/M3/Http/Controllers/UtilitiesController.php b/Modules/M3/Http/Controllers/UtilitiesController.php
index a389520e..9a990b55 100755
--- a/Modules/M3/Http/Controllers/UtilitiesController.php
+++ b/Modules/M3/Http/Controllers/UtilitiesController.php
@@ -30,7 +30,6 @@ class UtilitiesController extends Controller
             // Determine reason for failure.
             // Probably database authentication error or invalid or unreachable database.
             $code = $e->getCode();
-            $msg = $e->getMessage();
 
             switch ($code) {
                 case 8001:
@@ -68,10 +67,7 @@ class UtilitiesController extends Controller
         // ICM700C EWOBJTST  ICM700C  ICM700CSBM
         $result = $conn->pgmCall('ICM700CSBM', 'EWOBJTST', $params, [], []);
 
-        if (! $result) {
-        }
-        // Successful Call
-        else {
+        if ($result) {
             dump($result);
         }
 
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/M3GetPDF.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/M3GetPDF.blade.php
index f7f2cb30..f827f412 100755
--- a/Modules/M3/Resources/views/liberty-theme/pages/M3GetPDF.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/M3GetPDF.blade.php
@@ -20,7 +20,7 @@ Sentinel Doc Archive
                                 </div>
                                 <label for="recipient-name" class="col-sm-1 col-form-label">Warehouse:</label>
                                 <div class="col-sm-2">
-                                    <select class="form-select"  id="WHDDA" aria-label="WHDD" tabindex="-1" disabled>
+                                    <select class="form-select"  id="WHDDA" aria-label="Warehouse" tabindex="-1" disabled>
                                         @foreach ($IC670M as $key => $IC670MR)
                                             @php $currentWHDDA =  trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS); @endphp
                                             <option  value="{{ $currentWHDDA }}"
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/OrderLinesOfClosed.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/OrderLinesOfClosed.blade.php
index ca5d20dc..e7029b81 100755
--- a/Modules/M3/Resources/views/liberty-theme/pages/OrderLinesOfClosed.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/OrderLinesOfClosed.blade.php
@@ -29,7 +29,7 @@
 
                                 <div class="col">
                                     <label for="recipient-name" >Warehouse:</label>
-                                    <select class="form-select"  id="WHDDA" aria-label="WHDD" tabindex="-1" disabled>
+                                    <select class="form-select"  id="WHDDA" aria-label="Warehouse" tabindex="-1" disabled>
                                         @foreach ($IC670M as $key => $IC670MR)
                                             @php $currentWHDDA =  trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS); @endphp
                                             <option  value="{{ $currentWHDDA }}"
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/ReplenishSettings.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/ReplenishSettings.blade.php
index 9a7c3cff..f82907cb 100755
--- a/Modules/M3/Resources/views/liberty-theme/pages/ReplenishSettings.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/ReplenishSettings.blade.php
@@ -121,7 +121,7 @@
                             <div class="col-6">
                                 <div class="mb-3">
                                 <label for="recipient-name" class="col-form-label">Warehouse:</label>
-                                <select class="form-select"  id="WHDDA" aria-label="WHDD" tabindex="0" required>
+                                <select class="form-select"  id="WHDDA" aria-label="Warehouse" tabindex="0" required>
                                     <option value="">Select Warehouse</option>
                                     @foreach ($IC670M as $key => $IC670MR)
                                         <option  value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
@@ -215,7 +215,7 @@
                             <div class="col-6">
                                 <div class="mb-3">
                                 <label for="recipient-name" class="col-form-label">Warehouse:</label>
-                                <select class="form-select"  id="WHDD" aria-label="WHDD" tabindex="0" disabled>
+                                <select class="form-select"  id="WHDD" aria-label="Warehouse" tabindex="0" disabled>
                                     <option value="">Select Warehouse</option>
                                     @foreach ($IC670M as $key => $IC670MR)
                                         <option  value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/WhsPerfMetrics.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/WhsPerfMetrics.blade.php
index 0dd2eb2a..4128fb98 100755
--- a/Modules/M3/Resources/views/liberty-theme/pages/WhsPerfMetrics.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/WhsPerfMetrics.blade.php
@@ -19,7 +19,7 @@ Warehouse Performance Metrics report
 
                         <div class="col">
                             <label for="recipient-name" >Warehouse:</label>
-                            <select class="form-select"  id="WHDDA" aria-label="WHDD" tabindex="-1" disabled>
+                            <select class="form-select"  id="WHDDA" aria-label="Warehouse" tabindex="-1" disabled>
                                 @foreach ($IC670M as $key => $IC670MR)
                                     @php $currentWHDDA =  trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS); @endphp
                                     <option  value="{{ $currentWHDDA }}"
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/exedashboard.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/exedashboard.blade.php
index ffc6cfbf..e5e5b117 100755
--- a/Modules/M3/Resources/views/liberty-theme/pages/exedashboard.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/exedashboard.blade.php
@@ -28,7 +28,7 @@ Solon Sentinel Portal
                     <div class="row mb-3">
                         <label for="inputWhs" class="col-sm-2 col-form-label">Warehouse</label>
                             <div class="col-sm-10">
-                                <select aria-label="Whs" name="whs" class="form-control">
+                                <select aria-label="Warehouse" name="whs" class="form-control">
                                     <option value="*ALL">*ALL</option>
                                     @foreach($whs_array as $key)
                                         <option value={{$key}}
diff --git a/Modules/M3/Resources/views/liberty-theme/pages/whsePerfRequest.blade.php b/Modules/M3/Resources/views/liberty-theme/pages/whsePerfRequest.blade.php
index 6dcfab82..90b6bfd9 100755
--- a/Modules/M3/Resources/views/liberty-theme/pages/whsePerfRequest.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/pages/whsePerfRequest.blade.php
@@ -15,7 +15,7 @@ Sentinel Doc Archive
                             <div class="mb-2 row">
                                 <label for="date" class="col-sm-1 col-form-label">Select Year and Month</label>
                                 <div class="col-sm-1">
-                                    <select aria-label="Date In Yr" name="date_in_yr" id="date_in_yr">
+                                    <select aria-label="Year" name="date_in_yr" id="date_in_yr">
                                         @for($x=date('Y',strtotime(date('Y').'- 5 years'));$x<date('Y');$x++)
                                         <option value={{$x}}>{{$x}}</option>
                                         @endfor
diff --git a/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryAdd.blade.php b/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryAdd.blade.php
index 61378191..ca686c8e 100755
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryAdd.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryAdd.blade.php
@@ -25,7 +25,7 @@
                         <tr>
                             <td><b>Ship Via</b></td> <!-- ALPHA -->
                             <td class="text-right">
-                                <select aria-label="Addavshpvia" id="addAVSHPVIA" name="addAVSHPVIA">
+                                <select aria-label="Select Ship Via" id="addAVSHPVIA" name="addAVSHPVIA">
                                     <option value="">Select Ship Via</option>
                                     @foreach($shipvia as $key=>$val)
                                     <option value="{{$val->AXCODE}}">{{$val->AXCODE}} - {{$val->AXDESC}}</option>
diff --git a/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryEdit.blade.php b/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryEdit.blade.php
index e305ba42..4ec52228 100755
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryEdit.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/M3DeliveryEdit.blade.php
@@ -26,7 +26,7 @@
                             <td class="text-right">
                                 <label for="OLD_AVSHPVIA" class="visually-hidden">OLD AVSHPVIA</label>
 <input type="hidden" name="OLD_AVSHPVIA" id="OLD_AVSHPVIA">
-                                <select aria-label="Avshpvia" id="AVSHPVIA" name="AVSHPVIA">
+                                <select aria-label="Select Ship Via" id="AVSHPVIA" name="AVSHPVIA">
                                     <option value="">Select Ship Via</option>
                                     @foreach($shipvia as $key=>$val)
                                     <option value="{{$val->AXCODE}}">{{$val->AXCODE}} - {{$val->AXDESC}}</option>
diff --git a/Modules/M3/Resources/views/liberty-theme/partials/modals/userAdd.blade.php b/Modules/M3/Resources/views/liberty-theme/partials/modals/userAdd.blade.php
index ba8b8e64..6608fad4 100755
--- a/Modules/M3/Resources/views/liberty-theme/partials/modals/userAdd.blade.php
+++ b/Modules/M3/Resources/views/liberty-theme/partials/modals/userAdd.blade.php
@@ -55,7 +55,7 @@
                             <td><label for="R428DPW1" class="col-form-label"><b>Div-Plt-Whs:</b></label></td>
                             <td>
                             <div class="mb-3">
-                                <select class="form-select-sm myinput" name="R428DPW1" id="R428DPW1" aria-label="Div-Plt-Whs" required>
+                                <select class="form-select-sm myinput" name="R428DPW1" id="R428DPW1" aria-label="Select a value" required>
                                     <option value="" selected disabled hidden>Select a value</option>
                                     @foreach ($IC670M as $key => $IC670MR)
                                         <option value="{{ trim($IC670MR->WDCO).trim($IC670MR->WDPL).trim($IC670MR->WDWHS) }}"
diff --git a/Modules/M3/Services/PostgresProgramBridge.php b/Modules/M3/Services/PostgresProgramBridge.php
index 3a901017..530d8940 100755
--- a/Modules/M3/Services/PostgresProgramBridge.php
+++ b/Modules/M3/Services/PostgresProgramBridge.php
@@ -20,27 +20,31 @@ class PostgresProgramBridge
 
     private string $errorMessage = '';
 
+    private array $options = [];
+
     public function setOptions(array $options): self
     {
+        $this->options = $options;
+
         return $this;
     }
 
-    public function AddParameterChar(string $io, int $size, string $comment = '', string $name = '', mixed $value = null, mixed ...$rest): array
+    public function addParameterChar(string $io, int $size, string $comment = '', string $name = '', mixed $value = null): array
     {
         return compact('io', 'size', 'comment', 'name', 'value');
     }
 
-    public function AddParameterPackDec(string $io, int $length, int $scale, string $comment = '', string $name = '', mixed $value = null, mixed ...$rest): array
+    public function addParameterPackDec(string $io, int $length, int $scale, string $comment = '', string $name = '', mixed $value = null): array
     {
         return ['type' => 'packed_decimal'] + compact('io', 'length', 'scale', 'comment', 'name', 'value');
     }
 
-    public function AddParameterZoned(string $io, int $length, int $scale, string $comment = '', string $name = '', mixed $value = null, mixed ...$rest): array
+    public function addParameterZoned(string $io, int $length, int $scale, string $comment = '', string $name = '', mixed $value = null): array
     {
         return ['type' => 'zoned_decimal'] + compact('io', 'length', 'scale', 'comment', 'name', 'value');
     }
 
-    public function PgmCall(string $program, ?string $library = null, array $parameters = [], array $returnParameters = [], array $options = []): array|false
+    public function pgmCall(string $program, ?string $library = null, array $parameters = [], array $returnParameters = [], array $options = []): array|false
     {
         return $this->queue('program', $program, $library, [
             'parameters' => $parameters,
@@ -49,7 +53,7 @@ class PostgresProgramBridge
         ]);
     }
 
-    public function CLCommand(string $command): array|false
+    public function clCommand(string $command): array|false
     {
         return $this->queue('command', $command, null, []);
     }
diff --git a/Modules/Platform/resources/views/licenses/index.blade.php b/Modules/Platform/resources/views/licenses/index.blade.php
index 4c6e5421..3680bc7b 100755
--- a/Modules/Platform/resources/views/licenses/index.blade.php
+++ b/Modules/Platform/resources/views/licenses/index.blade.php
@@ -11,7 +11,7 @@
             <h2 class="text-lg font-bold text-zinc-900 dark:text-white">Issue licence key</h2>
             <form method="POST" action="{{ route('platform.licenses.store') }}" class="mt-5 grid gap-4 md:grid-cols-5">
                 @csrf
-                <select aria-label="Company Id" name="company_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
+                <select aria-label="Company" name="company_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
                     @foreach ($companies as $company)
                         <option value="{{ $company->id }}">{{ $company->name }}</option>
                     @endforeach
diff --git a/Modules/Platform/resources/views/payments/index.blade.php b/Modules/Platform/resources/views/payments/index.blade.php
index 0975c104..75af4e96 100755
--- a/Modules/Platform/resources/views/payments/index.blade.php
+++ b/Modules/Platform/resources/views/payments/index.blade.php
@@ -7,7 +7,7 @@
             <h2 class="text-lg font-bold text-zinc-900 dark:text-white">Add payment or override</h2>
             <form method="POST" action="{{ route('platform.payments.store') }}" class="mt-5 grid gap-4 md:grid-cols-6">
                 @csrf
-                <select aria-label="Company Id" name="company_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
+                <select aria-label="Company" name="company_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
                     @foreach ($companies as $company)
                         <option value="{{ $company->id }}">{{ $company->name }}</option>
                     @endforeach
diff --git a/Modules/Warehouse/resources/views/rules/index.blade.php b/Modules/Warehouse/resources/views/rules/index.blade.php
index 32a75521..85d6dbc5 100755
--- a/Modules/Warehouse/resources/views/rules/index.blade.php
+++ b/Modules/Warehouse/resources/views/rules/index.blade.php
@@ -7,7 +7,7 @@
             <h2 class="text-lg font-bold text-zinc-900 dark:text-white">Add validation rule</h2>
             <form method="POST" action="{{ route('warehouse-rules.store') }}" class="mt-5 grid gap-4 md:grid-cols-6">
                 @csrf
-                <select aria-label="Warehouse Id" name="warehouse_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
+                <select aria-label="Warehouse" name="warehouse_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
                     @foreach ($warehouses as $warehouse)
                         <option value="{{ $warehouse->id }}">{{ $warehouse->name }}</option>
                     @endforeach
diff --git a/resources/js/app.js b/resources/js/app.js
index bea37323..8dd87637 100755
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -146,7 +146,7 @@ function livewireComponentFor(element) {
     let current = element;
 
     while (current && current !== document.documentElement) {
-        if (current.hasAttribute && current.hasAttribute('wire:id')) {
+        if (current.hasAttribute?.('wire:id')) {
             if (!window.Livewire) {
                 return null;
             }