diff --git a/projects/aca-content/src/lib/components/search/search-input-control/search-input-control.component.ts b/projects/aca-content/src/lib/components/search/search-input-control/search-input-control.component.ts
index 87512c2a0..2e3d198d4 100644
--- a/projects/aca-content/src/lib/components/search/search-input-control/search-input-control.component.ts
+++ b/projects/aca-content/src/lib/components/search/search-input-control/search-input-control.component.ts
@@ -31,7 +31,7 @@ import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
 import { FormControl, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { noWhitespaceValidator } from 'projects/aca-content/folder-rules/src/rule-details/validators/no-whitespace.validator';
+import { noWhitespaceValidator } from 'projects/aca-shared/src/lib/validators/no-whitespace.validator';
 
 @Component({
   imports: [CommonModule, TranslatePipe, MatButtonModule, MatIconModule, MatFormFieldModule, MatInputModule, FormsModule, ReactiveFormsModule],
@@ -106,6 +106,6 @@ export class SearchInputControlComponent implements OnInit {
   }
 
   isTermTooShort() {
-    return !!(this.searchTerm.trim() && this.searchTerm.trim().length < 2);
+    return this.searchTerm.trim()?.length < 2;
   }
 }
diff --git a/projects/aca-content/src/lib/components/search/search-input/search-input.component.html b/projects/aca-content/src/lib/components/search/search-input/search-input.component.html
index 983879f3d..627fb2d9f 100644
--- a/projects/aca-content/src/lib/components/search/search-input/search-input.component.html
+++ b/projects/aca-content/src/lib/components/search/search-input/search-input.component.html
@@ -36,17 +36,21 @@
         (submit)="onSearchSubmit($event)"
         (searchChange)="onSearchChange($event)"
       />
-      <mat-error *ngIf="hasLibrariesConstraint" class="app-search-error">
-        {{ 'SEARCH.INPUT.HINT' | translate }}
+      <mat-error *ngIf="searchInputControl.searchFieldFormControl.touched" class="app-search-error">
+        <ng-container *ngIf="hasLibrariesConstraint; else checkRequired">
+          {{ 'SEARCH.INPUT.HINT' | translate }}
+        </ng-container>
+        <ng-template #checkRequired>
+          <ng-container *ngIf="searchInputControl.searchFieldFormControl.errors?.required; else checkWhitespace">
+            {{ 'SEARCH.INPUT.REQUIRED' | translate }}
+          </ng-container>
+        </ng-template>
+        <ng-template #checkWhitespace>
+          <ng-container *ngIf="searchInputControl.searchFieldFormControl.errors?.whitespace">
+            {{ 'SEARCH.INPUT.WHITESPACE' | translate }}
+          </ng-container>
+        </ng-template>
       </mat-error>
-      <mat-error
-        *ngIf="searchInputControl.searchFieldFormControl.errors?.required && searchInputControl.searchFieldFormControl.touched" class="app-search-error">
-        {{ 'SEARCH.INPUT.REQUIRED' | translate }}
-      </mat-error>
-      <mat-error *ngIf="searchInputControl.searchFieldFormControl.errors?.whitespace && searchInputControl.searchFieldFormControl.touched" class="app-search-error">
-        {{ 'SEARCH.INPUT.WHITESPACE' | translate }}
-      </mat-error>
-
       <div id="search-options" class="app-search-options">
         <mat-checkbox *ngFor="let option of searchOptions"
           id="{{ option.id }}"
diff --git a/projects/aca-content/src/lib/components/search/search-input/search-input.component.spec.ts b/projects/aca-content/src/lib/components/search/search-input/search-input.component.spec.ts
index 47b3c14be..3ee048959 100644
--- a/projects/aca-content/src/lib/components/search/search-input/search-input.component.spec.ts
+++ b/projects/aca-content/src/lib/components/search/search-input/search-input.component.spec.ts
@@ -47,13 +47,13 @@ describe('SearchInputComponent', () => {
     return error?.nativeElement.textContent.trim();
   }
 
-  async function openMenu() {
+  async function openMenu(): Promise<MatMenuHarness> {
     const menu = await loader.getHarness(MatMenuHarness);
     await menu.open();
     return menu;
   }
 
-  async function getCheckbox(id: string) {
+  function getCheckbox(id: string): Promise<MatCheckboxHarness> {
     const overlayLoader = TestbedHarnessEnvironment.documentRootLoader(fixture);
     return overlayLoader.getHarness(MatCheckboxHarness.with({ selector: `#${id}` }));
   }
diff --git a/projects/aca-content/folder-rules/src/rule-details/validators/no-whitespace.validator.spec.ts b/projects/aca-shared/src/lib/validators/no-whitespace.validator.spec.ts
similarity index 100%
rename from projects/aca-content/folder-rules/src/rule-details/validators/no-whitespace.validator.spec.ts
rename to projects/aca-shared/src/lib/validators/no-whitespace.validator.spec.ts
diff --git a/projects/aca-content/folder-rules/src/rule-details/validators/no-whitespace.validator.ts b/projects/aca-shared/src/lib/validators/no-whitespace.validator.ts
similarity index 96%
rename from projects/aca-content/folder-rules/src/rule-details/validators/no-whitespace.validator.ts
rename to projects/aca-shared/src/lib/validators/no-whitespace.validator.ts
index 75d6060b0..2e48d1479 100644
--- a/projects/aca-content/folder-rules/src/rule-details/validators/no-whitespace.validator.ts
+++ b/projects/aca-shared/src/lib/validators/no-whitespace.validator.ts
@@ -27,7 +27,7 @@ import { AbstractControl, ValidationErrors, ValidatorFn } from '@angular/forms';
 export const noWhitespaceValidator = (): ValidatorFn => {
   return (control: AbstractControl): ValidationErrors | null => {
     const rawValue = control.value;
-    if (rawValue === null || rawValue === '') {
+    if (!rawValue) {
       return null;
     }