diff --git a/Modules/Company/Resources/views/show.blade.php b/Modules/Company/Resources/views/show.blade.php
index 0d0c9293..6419d3f8 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 Id" name="division_id" class="rounded-xl border-zinc-300 dark:border-zinc-700 dark:bg-zinc-950">
+                                <select aria-label="Division assignment" 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="sonar-input-47ea6fa2d4" class="block text-xs font-bold uppercase tracking-wide text-zinc-500 dark:text-zinc-400">Division name</label>
+                                <label for="division_name" 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 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>
+                            <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>
                         </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 762f653a..dfcb24f4 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="Status" class="doc-select" name="status">
+                    <select aria-label="Filter by status" 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="Category" class="doc-select" name="category">
+                    <select aria-label="Filter by category" 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 f8c95db5..269fd4bd 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 class="block text-xs font-bold uppercase tracking-wide text-zinc-600 dark:text-zinc-300">
+            <label for="colour-select-{{ md5($model) }}" 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 aria-label="Form Field"
+                <select id="colour-select-{{ md5($model) }}" aria-label="{{ $label }}"
                     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/M3/Http/Controllers/API/CloseShipment.php b/Modules/M3/Http/Controllers/API/CloseShipment.php
index a1396b75..c7bae56e 100755
--- a/Modules/M3/Http/Controllers/API/CloseShipment.php
+++ b/Modules/M3/Http/Controllers/API/CloseShipment.php
@@ -260,7 +260,7 @@ class CloseShipment extends Controller
                         //     ->get();
 
                         // PFC : Check that Picked / Packed are all Equal
-                        foreach ($iCM688M2SL as $key => $ICM688M2SLR) {
+                        foreach ($iCM688M2SL as $ICM688M2SLR) {
                             $a5PICKED = isset($ICM688M2SLR->A5PICKED) ? $ICM688M2SLR->A5PICKED : 0;
                             $a5RSVQTY = isset($ICM688M2SLR->A5RSVQTY) ? $ICM688M2SLR->A5RSVQTY : 0;
                             $a5ShortShipQty = (int) $a5RSVQTY - (int) $a5PICKED;
diff --git a/Modules/M3/Http/Controllers/UtilitiesController.php b/Modules/M3/Http/Controllers/UtilitiesController.php
index e8779edc..2d6b2795 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:
diff --git a/public/js/wms-dashboard-charts.js b/public/js/wms-dashboard-charts.js
index 6c340335..3162aa93 100755
--- a/public/js/wms-dashboard-charts.js
+++ b/public/js/wms-dashboard-charts.js
@@ -115,8 +115,8 @@
         }
 
         document.querySelectorAll('[data-wms-chart]').forEach(function (canvas) {
-            let type = canvas.getAttribute('data-chart-type') || 'line';
-            let raw = canvas.getAttribute('data-chart-config') || '{}';
+            let type = canvas.dataset.chartType || 'line';
+            let raw = canvas.dataset.chartConfig || '{}';
             let config = {};
 
             try {
diff --git a/resources/js/app.js b/resources/js/app.js
index 399dab63..bea37323 100755
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -51,7 +51,7 @@ function renderWmsCharts() {
             return;
         }
 
-        const type = canvas.getAttribute('data-wms-chart');
+        const type = canvas.dataset.wmsChart;
         const labels = parseJsonAttribute(canvas, 'data-labels');
         const series = parseJsonAttribute(canvas, 'data-series');
         const values = parseJsonAttribute(canvas, 'data-values');
diff --git a/resources/js/charts/wms-dashboard-charts.js b/resources/js/charts/wms-dashboard-charts.js
index 6c340335..3162aa93 100755
--- a/resources/js/charts/wms-dashboard-charts.js
+++ b/resources/js/charts/wms-dashboard-charts.js
@@ -115,8 +115,8 @@
         }
 
         document.querySelectorAll('[data-wms-chart]').forEach(function (canvas) {
-            let type = canvas.getAttribute('data-chart-type') || 'line';
-            let raw = canvas.getAttribute('data-chart-config') || '{}';
+            let type = canvas.dataset.chartType || 'line';
+            let raw = canvas.dataset.chartConfig || '{}';
             let config = {};
 
             try {