From 4714615cdbc1a3e9d8ffdae3f46a317fc774d4da Mon Sep 17 00:00:00 2001
From: Mykyta Maliarchuk <mykyta.maliarchuk@hyland.com>
Date: Fri, 24 Oct 2025 08:50:05 +0200
Subject: [PATCH 1/3] [ACS-10271][ACS-10236] a11y - Search filters have no
 visible labels

---
 lib/content-services/src/lib/i18n/en.json     |  13 +-
 ...rch-chip-autocomplete-input.component.html |   1 +
 .../search-date-range.component.html          |   7 +-
 .../search-date-range.component.scss          |   8 -
 .../search-filter-chips.component.scss        |   4 -
 .../search-properties.component.html          |  97 +++++++------
 .../search-properties.component.scss          | 137 ++++--------------
 .../search-properties.component.ts            |  16 +-
 8 files changed, 111 insertions(+), 172 deletions(-)

diff --git a/lib/content-services/src/lib/i18n/en.json b/lib/content-services/src/lib/i18n/en.json
index 6dd642b9576..bfd41e488f5 100644
--- a/lib/content-services/src/lib/i18n/en.json
+++ b/lib/content-services/src/lib/i18n/en.json
@@ -428,7 +428,8 @@
       "IN_LAST_LABELS": {
         "DAYS": "Days",
         "WEEKS": "Weeks",
-        "MONTHS": "Months"
+        "MONTHS": "Months",
+        "QUANTITY": "Quantity"
       },
       "IN_LAST_DISPLAY_LABELS": {
         "DAYS": "In the last {{value}} days",
@@ -437,7 +438,8 @@
       },
       "BETWEEN_PLACEHOLDERS": {
         "START_DATE": "Start Date",
-        "END_DATE": "End Date"
+        "END_DATE": "End Date",
+        "DATE_RANGE": "Date Range"
       },
       "ERROR": {
         "IN_LAST": "Value required",
@@ -468,7 +470,12 @@
         "GB": "GB"
       },
       "FILE_TYPE": "File Type",
-      "FILE_TYPE_PLACEHOLDER": "Add file type"
+      "FILE_TYPE_PLACEHOLDER": "Add file type",
+      "ACCESSIBILITY": {
+        "CONDITION": "Condition",
+        "SIZE_VALUE": "File size value",
+        "UNIT": "Unit"
+      }
     }
   },
   "PERMISSION": {
diff --git a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.html b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.html
index b6b86e5c1c4..6785d7d21ec 100644
--- a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.html
+++ b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.html
@@ -1,4 +1,5 @@
 <mat-form-field class="adf-chip-list" appearance="outline">
+    <mat-label>{{ placeholder | translate }}</mat-label>
     <mat-chip-grid #chipList [attr.aria-label]="'SEARCH.FILTER.ARIA-LABEL.OPTIONS-SELECTION' | translate">
         <mat-chip-row
             class="adf-option-chips adf-autocomplete-added-option-chips"
diff --git a/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.html b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.html
index e0212ddf701..a34f8eb17aa 100644
--- a/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.html
+++ b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.html
@@ -9,7 +9,8 @@
       <mat-radio-button [value]="DateRangeType.IN_LAST" data-automation-id="date-range-in-last">
         {{ 'SEARCH.DATE_RANGE_ADVANCED.OPTIONS.IN_LAST' | translate }}
       </mat-radio-button>
-      <mat-form-field class="adf-search-date-range-form-field adf-search-date-range-input-field" subscriptSizing="dynamic">
+      <mat-form-field class="adf-search-date-range-form-field adf-search-date-range-input-field" subscriptSizing="dynamic" floatLabel="always">
+        <mat-label>{{ 'SEARCH.DATE_RANGE_ADVANCED.IN_LAST_LABELS.QUANTITY' | translate }}</mat-label>
         <input matInput [attr.aria-label]="'SEARCH.DATE_RANGE_ADVANCED.ARIA_LABEL.NUMBER_INPUT' | translate"
                type="number" min="1" formControlName="inLastValue"
                data-automation-id="date-range-in-last-input" (input)="narrowDownAllowedCharacters($event)"
@@ -17,6 +18,7 @@
         <mat-error *ngIf="form.controls.inLastValue.errors?.required">{{ 'SEARCH.DATE_RANGE_ADVANCED.ERROR.IN_LAST' | translate }}</mat-error>
       </mat-form-field>
       <mat-form-field class="adf-search-date-range-form-field adf-search-date-range-form-field-select" subscriptSizing="dynamic">
+        <mat-label>{{ 'SEARCH.SEARCH_PROPERTIES.ACCESSIBILITY.UNIT' | translate }}</mat-label>
         <mat-select formControlName="inLastValueType" data-automation-id="date-range-in-last-dropdown">
           <mat-option data-automation-id="date-range-in-last-option-days" [value]="InLastDateType.DAYS">{{ 'SEARCH.DATE_RANGE_ADVANCED.IN_LAST_LABELS.DAYS' | translate }}</mat-option>
           <mat-option data-automation-id="date-range-in-last-option-weeks" [value]="InLastDateType.WEEKS">{{ 'SEARCH.DATE_RANGE_ADVANCED.IN_LAST_LABELS.WEEKS' | translate }}</mat-option>
@@ -28,7 +30,8 @@
       <mat-radio-button [value]="DateRangeType.BETWEEN" data-automation-id="date-range-between">
         {{ 'SEARCH.DATE_RANGE_ADVANCED.OPTIONS.BETWEEN' | translate }}
       </mat-radio-button>
-      <mat-form-field class="adf-search-date-range-form-field" subscriptSizing="dynamic">
+      <mat-form-field class="adf-search-date-range-form-field" subscriptSizing="dynamic" floatLabel="always">
+        <mat-label>{{ 'SEARCH.DATE_RANGE_ADVANCED.BETWEEN_PLACEHOLDERS.DATE_RANGE' | translate }}</mat-label>
         <mat-date-range-input [rangePicker]="$any(picker)" [max]="convertedMaxDate">
           <input matStartDate placeholder="{{ 'SEARCH.DATE_RANGE_ADVANCED.BETWEEN_PLACEHOLDERS.START_DATE' | translate }}"
                  data-automation-id="date-range-between-start-input" [formControl]="betweenStartDateFormControl" (change)="dateChanged($event, betweenStartDateFormControl)">
diff --git a/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.scss b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.scss
index 6aa30f4f48e..374869e025f 100644
--- a/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.scss
+++ b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.scss
@@ -32,14 +32,6 @@ adf-search-date-range {
                 padding-left: 10px;
                 flex: 1;
                 margin-bottom: 12px;
-
-                #{ms.$mat-form-field-flex} {
-                    align-items: center;
-
-                    #{ms.$mat-form-field-infix} {
-                        padding: 0.375em 0 4px;
-                    }
-                }
             }
         }
     }
diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.scss b/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.scss
index 3e86957c531..1c030ac9f43 100644
--- a/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.scss
+++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.scss
@@ -44,10 +44,6 @@
         min-width: 320px;
         border-radius: 12px;
 
-        &:has(.adf-search-properties-file-size-operator) {
-            min-width: 365px;
-        }
-
         @include mat.elevation(2);
     }
 }
diff --git a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.html b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.html
index 8a42b7c1905..d0a1222a3e8 100644
--- a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.html
+++ b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.html
@@ -1,47 +1,60 @@
 <form [formGroup]="form" class="adf-search-properties-form">
-    <div class="adf-search-properties-file-size-container">
-        <label
-            for="adf-search-properties-file-size"
-            class="adf-search-properties-file-size-label">
+    <div role="group" aria-labelledby="file-size-label">
+        <label id="file-size-label" class="adf-search-properties-file-size-label">
             {{ 'SEARCH.SEARCH_PROPERTIES.FILE_SIZE' | translate }}
         </label>
-        <mat-form-field
-            [style.width.px]="fileSizeOperatorsMaxWidth"
-            subscriptSizing="dynamic"
-            class="adf-search-properties-file-size-operator">
-            <mat-select
-                data-automation-id="adf-search-properties-file-size-operator-select"
-                [formControl]="form.controls.fileSizeOperator"
-                #fileSizeOperatorSelect>
-                <mat-option
-                    *ngFor="let fileSizeOperator of fileSizeOperators"
-                    [value]="fileSizeOperator">
-                    {{ fileSizeOperator | translate }}
-                </mat-option>
-            </mat-select>
-        </mat-form-field>
-        <input
-            [formControl]="form.controls.fileSize"
-            type="number"
-            min="0"
-            step="any"
-            (input)="narrowDownAllowedCharacters($event)"
-            (keydown)="preventIncorrectNumberCharacters($event)"
-            id="adf-search-properties-file-size"
-            [placeholder]="'SEARCH.SEARCH_PROPERTIES.FILE_SIZE_PLACEHOLDER' | translate"
-            (blur)="clearNumberFieldWhenInvalid($event)"
-            data-automation-id="adf-search-properties-file-size-input" />
-        <mat-form-field class="adf-search-properties-file-size-unit" subscriptSizing="dynamic">
-            <mat-select
-                [formControl]="form.controls.fileSizeUnit"
-                data-automation-id="adf-search-properties-file-size-unit-select">
-                <mat-option
-                    *ngFor="let fileSizeUnit of fileSizeUnits"
-                    [value]="fileSizeUnit">
-                    {{ fileSizeUnit.abbreviation | translate }}
-                </mat-option>
-            </mat-select>
-        </mat-form-field>
+        <div class="adf-search-properties-file-size-container">
+            <mat-form-field
+                class="adf-search-properties-form-field"
+                [style.flex]="'0 0 ' + fileSizeOperatorsMaxWidth + 'px'"
+                subscriptSizing="dynamic"
+                data-automation-id="adf-search-properties-file-size-operator"
+                appearance="outline">
+                <mat-label>{{ 'SEARCH.SEARCH_PROPERTIES.ACCESSIBILITY.CONDITION' | translate }}</mat-label>
+                <mat-select
+                    data-automation-id="adf-search-properties-file-size-operator-select"
+                    [formControl]="form.controls.fileSizeOperator"
+                    #fileSizeOperatorSelect>
+                    <mat-option
+                        *ngFor="let fileSizeOperator of fileSizeOperators"
+                        [value]="fileSizeOperator">
+                        {{ fileSizeOperator | translate }}
+                    </mat-option>
+                </mat-select>
+            </mat-form-field>
+            <mat-form-field class="adf-search-properties-form-field" appearance="outline" floatLabel="always">
+                <mat-label>{{ 'SEARCH.SEARCH_PROPERTIES.ACCESSIBILITY.SIZE_VALUE' | translate }}</mat-label>
+                <input
+                    matInput
+                    [formControl]="form.controls.fileSize"
+                    type="number"
+                    min="0"
+                    step="any"
+                    (input)="narrowDownAllowedCharacters($event)"
+                    (keydown)="preventIncorrectNumberCharacters($event)"
+                    id="adf-search-properties-file-size"
+                    [placeholder]="'SEARCH.SEARCH_PROPERTIES.FILE_SIZE_PLACEHOLDER' | translate"
+                    (blur)="clearNumberFieldWhenInvalid($event)"
+                    data-automation-id="adf-search-properties-file-size-input"/>
+            </mat-form-field>
+            <mat-form-field
+                class="adf-search-properties-form-field"
+                data-automation-id="adf-search-properties-file-size-unit"
+                subscriptSizing="dynamic"
+                appearance="outline">
+                <mat-label>{{ 'SEARCH.SEARCH_PROPERTIES.ACCESSIBILITY.UNIT' | translate }}</mat-label>
+                <mat-select
+                    [attr.aria-label]="'SEARCH.SEARCH_PROPERTIES.ACCESSIBILITY.UNIT' | translate"
+                    [formControl]="form.controls.fileSizeUnit"
+                    data-automation-id="adf-search-properties-file-size-unit-select">
+                    <mat-option
+                        *ngFor="let fileSizeUnit of fileSizeUnits"
+                        [value]="fileSizeUnit">
+                        {{ fileSizeUnit.abbreviation | translate }}
+                    </mat-option>
+                </mat-select>
+            </mat-form-field>
+        </div>
     </div>
     <p class="adf-search-properties-file-type-label">{{ 'SEARCH.SEARCH_PROPERTIES.FILE_TYPE' | translate }}</p>
     <adf-search-chip-autocomplete-input
@@ -53,5 +66,5 @@
         [compareOption]="compareFileExtensions"
         [formatChipValue]="getExtensionWithoutDot"
         [filter]="filterExtensions"
-        placeholder="SEARCH.SEARCH_PROPERTIES.FILE_TYPE" />
+        placeholder="SEARCH.SEARCH_PROPERTIES.FILE_TYPE"/>
 </form>
diff --git a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.scss b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.scss
index 103094b47fb..c95e709158d 100644
--- a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.scss
+++ b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.scss
@@ -3,133 +3,48 @@
 
 adf-search-properties {
     .adf-search-properties-form {
-        .adf-search-properties-file-size-container {
-            .adf-search-properties-file-size-label {
-                margin-top: 4px;
-                display: block;
-            }
+        .adf-search-properties-file-size-label {
+            margin-top: 4px;
+            margin-bottom: 10px;
+            display: block;
+        }
 
-            #{ms.$mat-text-field-no-label} {
-                #{ms.$mat-form-field-infix} {
-                    padding-top: 9px;
-                    padding-bottom: 9px;
-                    display: inline-block;
-                }
-            }
+        .adf-search-properties-file-type-label {
+            margin-top: 10px;
+            margin-bottom: 6px;
+        }
+
+        .adf-search-properties-file-size-container {
+            width: 370px;
+            display: flex;
 
             #{ms.$mat-form-field-infix} {
                 height: 37.5px;
                 min-height: 37.5px;
-                display: inline-block;
+                padding-top: 9px;
             }
 
-            #{ms.$mat-select-trigger} {
-                height: 17.5px;
-            }
-
-            #{ms.$mat-select-arrow-wrapper} {
-                width: 16px;
-            }
-
-            #{ms.$mat-line-ripple} {
-                &::before {
-                    display: none;
-                }
-            }
-
-            #{ms.$mat-select-arrow} {
-                margin-left: 5px;
-            }
-
-            #{ms.$mat-form-field} {
-                margin-bottom: 18px;
-            }
-        }
-
-        adf-search-chip-autocomplete-input {
-            display: block;
-
             #{ms.$mat-text-field-outlined} {
-                &-start,
-                &-end {
-                    border-top: 1px solid var(--adf-theme-mat-grey-color-a400);
-                    border-bottom: 1px solid var(--adf-theme-mat-grey-color-a400);
-                }
+                padding: 0 9px;
+            }
 
-                &-start {
-                    border-left: 1px solid var(--adf-theme-mat-grey-color-a400);
-                }
+            .adf-search-properties-form-field {
+                width: 100%;
+                display: block;
+                flex: 1;
 
-                &-end {
-                    border-right: 1px solid var(--adf-theme-mat-grey-color-a400);
+                &:nth-child(1) {
+                    min-width: 115px;
                 }
-            }
 
-            #{ms.$mat-focused} {
-                #{ms.$mat-text-field-outlined} {
-                    outline: 2px auto -webkit-focus-ring-color;
+                &:nth-child(2) {
+                    margin: 0 8px;
                 }
-            }
 
-            #{ms.$mat-form-field-appearance-outline} {
-                #{ms.$mat-text-field-outlined-thick} {
-                    #{ms.$mat-text-field-outlined} {
-                        &-start,
-                        &-end {
-                            border-width: 1px;
-                        }
-                    }
+                &:nth-child(3) {
+                    max-width: 90px;
                 }
             }
-
-            #{ms.$mat-notched-outline-leading} {
-                border-color: var(--adf-theme-foreground-text-color-027);
-            }
-
-            #{ms.$mat-notched-outline-trailing} {
-                border-color: var(--adf-theme-foreground-text-color-027);
-            }
-        }
-    }
-
-    input,
-    .mat-form-field-infix.mat-form-field-infix {
-        height: 25px;
-        border: 1px solid var(--adf-theme-mat-grey-color-a400);
-        border-radius: 5px;
-        margin-top: 5px;
-        padding: 5px;
-        font-size: 14px;
-        color: var(--adf-theme-foreground-text-color);
-        margin-left: 8px;
-        margin-right: 8px;
-    }
-
-    .adf-search-properties-file-size-operator,
-    .adf-search-properties-file-size-unit {
-        #{ms.$mat-form-field-infix} {
-            border: 1px solid var(--adf-theme-mat-grey-color-a400);
-            border-radius: 5px;
-            padding: 9px;
-        }
-
-        &#{ms.$mat-focused} {
-            #{ms.$mat-form-field-infix} {
-                outline: 2px auto -webkit-focus-ring-color;
-            }
         }
     }
-
-    .adf-search-properties-file-size-unit {
-        width: 78px;
-    }
-
-    .adf-search-properties-file-type-label {
-        margin-top: 10px;
-        margin-bottom: 6px;
-    }
-}
-
-.adf-search-filter-chip-menu-panel-properties {
-    max-width: unset;
 }
diff --git a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts
index 1e3d892e598..75eca69cd28 100644
--- a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts
+++ b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts
@@ -30,13 +30,22 @@ import { AutocompleteOption } from '../../models/autocomplete-option.interface';
 import { CommonModule } from '@angular/common';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatSelectModule } from '@angular/material/select';
+import { MatInputModule } from '@angular/material/input';
 import { SearchChipAutocompleteInputComponent } from '../search-chip-autocomplete-input';
 import { map } from 'rxjs/operators';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 @Component({
     selector: 'adf-search-properties',
-    imports: [CommonModule, ReactiveFormsModule, TranslatePipe, MatFormFieldModule, MatSelectModule, SearchChipAutocompleteInputComponent],
+    imports: [
+        CommonModule,
+        ReactiveFormsModule,
+        TranslatePipe,
+        MatFormFieldModule,
+        MatSelectModule,
+        MatInputModule,
+        SearchChipAutocompleteInputComponent
+    ],
     templateUrl: './search-properties.component.html',
     styleUrls: ['./search-properties.component.scss'],
     encapsulation: ViewEncapsulation.None
@@ -97,7 +106,10 @@ export class SearchPropertiesComponent implements OnInit, AfterViewChecked, Sear
 
     private readonly destroyRef = inject(DestroyRef);
 
-    constructor(private formBuilder: FormBuilder, private translateService: TranslateService) {}
+    constructor(
+        private formBuilder: FormBuilder,
+        private translateService: TranslateService
+    ) {}
 
     ngOnInit() {
         if (this.settings) {

From 8e3435bd4770303c778dbec9bffec8cfb0de1ff4 Mon Sep 17 00:00:00 2001
From: Mykyta Maliarchuk <mykyta.maliarchuk@hyland.com>
Date: Fri, 24 Oct 2025 11:14:34 +0200
Subject: [PATCH 2/3] [ACS-10271] sonar fix

---
 .../search-properties/search-properties.component.html    | 8 ++++----
 .../search-properties/search-properties.component.scss    | 6 ++++++
 .../search-properties/search-properties.component.ts      | 4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.html b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.html
index d0a1222a3e8..175a66082a2 100644
--- a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.html
+++ b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.html
@@ -1,8 +1,8 @@
 <form [formGroup]="form" class="adf-search-properties-form">
-    <div role="group" aria-labelledby="file-size-label">
-        <label id="file-size-label" class="adf-search-properties-file-size-label">
+    <fieldset aria-labelledby="file-size-label">
+        <legend id="file-size-label" class="adf-search-properties-file-size-label">
             {{ 'SEARCH.SEARCH_PROPERTIES.FILE_SIZE' | translate }}
-        </label>
+        </legend>
         <div class="adf-search-properties-file-size-container">
             <mat-form-field
                 class="adf-search-properties-form-field"
@@ -55,7 +55,7 @@
                 </mat-select>
             </mat-form-field>
         </div>
-    </div>
+    </fieldset>
     <p class="adf-search-properties-file-type-label">{{ 'SEARCH.SEARCH_PROPERTIES.FILE_TYPE' | translate }}</p>
     <adf-search-chip-autocomplete-input
         [autocompleteOptions]="autocompleteOptions"
diff --git a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.scss b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.scss
index c95e709158d..06155b837e2 100644
--- a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.scss
+++ b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.scss
@@ -3,6 +3,12 @@
 
 adf-search-properties {
     .adf-search-properties-form {
+        fieldset {
+            padding: 0;
+            margin: 0;
+            border: none;
+        }
+
         .adf-search-properties-file-size-label {
             margin-top: 4px;
             margin-bottom: 10px;
diff --git a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts
index 75eca69cd28..9ceeb0ceafe 100644
--- a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts
+++ b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts
@@ -107,8 +107,8 @@ export class SearchPropertiesComponent implements OnInit, AfterViewChecked, Sear
     private readonly destroyRef = inject(DestroyRef);
 
     constructor(
-        private formBuilder: FormBuilder,
-        private translateService: TranslateService
+        private readonly formBuilder: FormBuilder,
+        private readonly translateService: TranslateService
     ) {}
 
     ngOnInit() {

From 787ae4276bf4e76ad230ae9d09a4cba4b1c731a0 Mon Sep 17 00:00:00 2001
From: Mykyta Maliarchuk <mykyta.maliarchuk@hyland.com>
Date: Fri, 24 Oct 2025 11:53:17 +0200
Subject: [PATCH 3/3] [ACS-10271] cr fix

---
 .../search-date-range/search-date-range.component.html         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.html b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.html
index a34f8eb17aa..8275e3516f2 100644
--- a/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.html
+++ b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.html
@@ -10,8 +10,9 @@
         {{ 'SEARCH.DATE_RANGE_ADVANCED.OPTIONS.IN_LAST' | translate }}
       </mat-radio-button>
       <mat-form-field class="adf-search-date-range-form-field adf-search-date-range-input-field" subscriptSizing="dynamic" floatLabel="always">
-        <mat-label>{{ 'SEARCH.DATE_RANGE_ADVANCED.IN_LAST_LABELS.QUANTITY' | translate }}</mat-label>
+        <mat-label id="adf-search-date-range-quantity-label">{{ 'SEARCH.DATE_RANGE_ADVANCED.IN_LAST_LABELS.QUANTITY' | translate }}</mat-label>
         <input matInput [attr.aria-label]="'SEARCH.DATE_RANGE_ADVANCED.ARIA_LABEL.NUMBER_INPUT' | translate"
+               aria-labelledby="adf-search-date-range-quantity-label"
                type="number" min="1" formControlName="inLastValue"
                data-automation-id="date-range-in-last-input" (input)="narrowDownAllowedCharacters($event)"
                (keydown)="preventIncorrectNumberCharacters($event)">