diff --git a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.spec.ts b/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.spec.ts
index 6602811186..4f5e41c99a 100644
--- a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.spec.ts
+++ b/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.spec.ts
@@ -62,7 +62,7 @@ export class MockSearchDateRangeAdvancedComponent {
     @Output()
     valid = new EventEmitter<boolean>();
 }
-describe('SearchDateRangeAdvancedTabbedComponent', () => {
+fdescribe('SearchDateRangeAdvancedTabbedComponent', () => {
     let component: SearchDateRangeAdvancedTabbedComponent;
     let fixture: ComponentFixture<SearchDateRangeAdvancedTabbedComponent>;
     let betweenMockData: SearchDateRangeAdvanced;
diff --git a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.spec.ts b/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.spec.ts
index 43fc759825..fa570f6c6b 100644
--- a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.spec.ts
+++ b/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.spec.ts
@@ -63,13 +63,12 @@ describe('SearchDateRangeAdvancedComponent', () => {
         fixture.detectChanges();
     };
 
-    const selectDropdownOption = async (itemId: string) => {
+    const selectDropdownOption = (itemId: string) => {
         const matSelect = fixture.debugElement.query(By.css('[data-automation-id="date-range-advanced-in-last-dropdown"]')).nativeElement;
         matSelect.click();
         fixture.detectChanges();
         const matOption = fixture.debugElement.query(By.css(`[data-automation-id="${itemId}"]`)).nativeElement;
         matOption.click();
-        await fixture.whenStable();
         fixture.detectChanges();
     };
 
diff --git a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.ts b/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.ts
index d0792a9c19..99c26ce011 100644
--- a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.ts
+++ b/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.ts
@@ -177,4 +177,27 @@ export class SearchDateRangeAdvancedComponent implements OnInit, OnDestroy {
                 return true;
         }
     }
+
+    // dateChanged(event: Event, formControl: FormControl<Date | null>) {
+    //     clearTimeout(this.dateChangeDebounce);
+    //     this.dateChangeDebounce = window.setTimeout(() => {
+    //         if (!event?.target['value']) {
+    //             formControl.errors.required = true;
+    //             formControl.errors.dateFormatInvalid = false;
+    //         } else {
+    //             const date = parse(event.target['value'], this.datePickerFormat, new Date());
+    //             if(!isValid(date)) {
+    //                 formControl.errors.dateFormatInvalid = true;
+    //             } else {
+    //                 formControl.errors.dateFormatInvalid = false;
+    //                 formControl.setValue(date);
+    //             }
+    //         }
+    //     }, 500);
+    // }
+
+    onLastDateValueChanged(event: Event) {
+        let value: string = event.target['value'];
+        event.target['value'] = value.replace(/[-.]*0*([1-9]*[0-9]*)/g, '$1');
+    }
 }
diff --git a/lib/content-services/src/lib/search/components/search-filter-tabbed/search-filter-tabbed.component.scss b/lib/content-services/src/lib/search/components/search-filter-tabbed/search-filter-tabbed.component.scss
index f79be8036f..ff0f0f82f5 100644
--- a/lib/content-services/src/lib/search/components/search-filter-tabbed/search-filter-tabbed.component.scss
+++ b/lib/content-services/src/lib/search/components/search-filter-tabbed/search-filter-tabbed.component.scss
@@ -18,8 +18,7 @@ adf-search-filter-tabbed {
         display: none;
     }
 
-    .mat-tab-body.mat-tab-body-active .mat-tab-body-content {
-        display: block;
-        visibility: visible !important;
+    .mat-ink-bar {
+        display: none;
     }
 }
diff --git a/lib/content-services/src/lib/search/components/search-filter-tabbed/search-filter-tabbed.component.spec.ts b/lib/content-services/src/lib/search/components/search-filter-tabbed/search-filter-tabbed.component.spec.ts
index 7939bb28b1..0f744fcd6d 100644
--- a/lib/content-services/src/lib/search/components/search-filter-tabbed/search-filter-tabbed.component.spec.ts
+++ b/lib/content-services/src/lib/search/components/search-filter-tabbed/search-filter-tabbed.component.spec.ts
@@ -20,12 +20,12 @@ import { TranslateModule } from '@ngx-translate/core';
 import { ContentTestingModule } from '../../../testing/content.testing.module';
 import { SearchFilterTabbedComponent } from './search-filter-tabbed.component';
 
-describe('SearchFilterTabbedComponent', () => {
+fdescribe('SearchFilterTabbedComponent', () => {
     let component: SearchFilterTabbedComponent;
     let fixture: ComponentFixture<SearchFilterTabbedComponent>;
 
-    beforeEach(async () => {
-        await TestBed.configureTestingModule({
+    beforeEach(() => {
+        TestBed.configureTestingModule({
             declarations: [SearchFilterTabbedComponent],
             imports: [
                 TranslateModule.forRoot(),
@@ -49,7 +49,7 @@ describe('SearchFilterTabbedComponent', () => {
     });
 
     it ('should emit a single combined value to display when multiple display values are provided', () => {
-       spyOn(component.valuesToDisplayCombined, 'emit');
+        spyOn(component.valuesToDisplayCombined, 'emit');
         component.settings = {
             field: 'testField1, testField2, testField3',
             displayedLabelsByField: {
@@ -87,7 +87,7 @@ describe('SearchFilterTabbedComponent', () => {
     });
 
     it('should emit an array of fields when all the fields are provided in a combined string via settings', () => {
-        spyOn(component.fieldsChanged, 'emit');
+       spyOn(component.fieldsChanged, 'emit');
        component.settings = {
            field: 'testField1, testField2, testField3'
        };
diff --git a/lib/content-services/src/lib/search/components/search-widget-container/search-widget-container.component.ts b/lib/content-services/src/lib/search/components/search-widget-container/search-widget-container.component.ts
index a3bce95256..1455e456d2 100644
--- a/lib/content-services/src/lib/search/components/search-widget-container/search-widget-container.component.ts
+++ b/lib/content-services/src/lib/search/components/search-widget-container/search-widget-container.component.ts
@@ -57,7 +57,6 @@ export class SearchWidgetContainerComponent implements OnInit, OnDestroy, OnChan
     @Input()
     value: any;
 
-
     componentRef: ComponentRef<any>;
 
     constructor(