diff --git a/packages/atomic/cypress/e2e/breadbox.cypress.ts b/packages/atomic/cypress/e2e/breadbox.cypress.ts
index 1d390b1787b..1c50ff01070 100644
--- a/packages/atomic/cypress/e2e/breadbox.cypress.ts
+++ b/packages/atomic/cypress/e2e/breadbox.cypress.ts
@@ -271,7 +271,7 @@ describe('Breadbox Test Suites', () => {
   });
 
   describe('when excluding from a standard facet', () => {
-    const selectionIndex = 2;
+    const selectionIndex = 1;
 
     function setupFacetWithMultipleExcludedValues() {
       new TestFixture()
diff --git a/packages/atomic/src/components/commerce/atomic-commerce-search-box/atomic-commerce-search-box.tsx b/packages/atomic/src/components/commerce/atomic-commerce-search-box/atomic-commerce-search-box.tsx
index 2e5f573745d..949e299bf94 100644
--- a/packages/atomic/src/components/commerce/atomic-commerce-search-box/atomic-commerce-search-box.tsx
+++ b/packages/atomic/src/components/commerce/atomic-commerce-search-box/atomic-commerce-search-box.tsx
@@ -203,22 +203,46 @@ export class AtomicCommerceSearchBox
 
   @AriaLiveRegion('search-suggestions', true)
   protected suggestionsAriaMessage!: string;
+  public disconnectedCallback = () => {};
+
+  private isStandaloneSearchBox(
+    searchBox: SearchBox | StandaloneSearchBox
+  ): searchBox is StandaloneSearchBox {
+    return 'redirectTo' in searchBox;
+  }
 
   public initialize() {
-    this.id = randomID('atomic-commerce-search-box-');
+    this.id ??= randomID('atomic-commerce-search-box-');
+
+    this.initializeSearchboxController();
+    this.initializeSuggestionManager();
+  }
+
+  private updateRedirectionUrl() {
+    if (this.isStandaloneSearchBox(this.searchBox) && this.redirectionUrl) {
+      this.searchBox.updateRedirectUrl(this.redirectionUrl);
+    } else {
+      this.registerNewSearchBoxController();
+    }
+  }
+
+  private registerNewSearchBoxController() {
+    this.disconnectedCallback();
+    this.initialize();
+  }
 
+  private initializeSearchboxController() {
     this.searchBox = this.redirectionUrl
       ? buildStandaloneSearchBox(this.bindings.engine, {
           options: {
             ...this.searchBoxOptions,
             redirectionUrl: this.redirectionUrl,
+            overwrite: true,
           },
         })
       : buildSearchBox(this.bindings.engine, {
           options: this.searchBoxOptions,
         });
-
-    this.initializeSuggestionManager();
   }
 
   public componentWillUpdate() {
@@ -271,7 +295,7 @@ export class AtomicCommerceSearchBox
     this.suggestionManager.forceUpdate();
   }
 
-  public componentWillRender() {
+  private registerSearchboxSuggestionEvents() {
     this.searchBoxSuggestionEventsQueue.forEach((evt) => {
       this.suggestionManager.registerSuggestionsFromEvent(
         evt,
@@ -283,7 +307,7 @@ export class AtomicCommerceSearchBox
 
   @Watch('redirectionUrl')
   watchRedirectionUrl() {
-    this.initialize();
+    this.updateRedirectionUrl();
   }
 
   private initializeSuggestionManager() {
@@ -324,8 +348,8 @@ export class AtomicCommerceSearchBox
     return {
       ...this.bindings,
       id: this.id,
-      isStandalone: !!this.redirectionUrl,
-      searchBoxController: this.searchBox,
+      isStandalone: () => !!this.redirectionUrl,
+      searchBoxController: () => this.searchBox,
       numberOfQueries: this.numberOfQueries,
       clearFilters: this.clearFilters,
     };
@@ -675,6 +699,9 @@ export class AtomicCommerceSearchBox
     const isDisabled = this.isSearchDisabledForEndUser(
       this.searchBoxState.value
     );
+    if (!this.suggestionManager.suggestions.length) {
+      this.registerSearchboxSuggestionEvents();
+    }
 
     return (
       <Host>
diff --git a/packages/atomic/src/components/commerce/atomic-commerce-search-box/e2e/atomic-commerce-search-box.e2e.ts b/packages/atomic/src/components/commerce/atomic-commerce-search-box/e2e/atomic-commerce-search-box.e2e.ts
index 56cb9dc3add..e28c87f6c32 100644
--- a/packages/atomic/src/components/commerce/atomic-commerce-search-box/e2e/atomic-commerce-search-box.e2e.ts
+++ b/packages/atomic/src/components/commerce/atomic-commerce-search-box/e2e/atomic-commerce-search-box.e2e.ts
@@ -274,6 +274,35 @@ test.describe('with instant results & query suggestions', () => {
         await expect(searchBox.searchInput).toHaveValue('surf');
       });
     });
+
+    test.describe('after updating the redirect-url attribute', () => {
+      test.beforeEach(async ({searchBox}) => {
+        await searchBox.component.evaluate((node) =>
+          node.setAttribute(
+            'redirection-url',
+            './iframe.html?id=atomic-commerce-search-box--in-page&viewMode=story&args=enable-query-syntax:!true;suggestion-timeout:5000'
+          )
+        );
+      });
+
+      test('should redirect to the specified url after selecting a suggestion', async ({
+        page,
+        searchBox,
+      }) => {
+        const suggestionText = await searchBox
+          .searchSuggestions()
+          .first()
+          .textContent();
+
+        expect(suggestionText).not.toBeNull();
+
+        await searchBox.searchSuggestions().first().click();
+        await page.waitForURL(
+          '**/iframe.html?id=atomic-commerce-search-box--in-page*'
+        );
+        await expect(searchBox.searchInput).toHaveValue(suggestionText ?? '');
+      });
+    });
   });
 });
 
diff --git a/packages/atomic/src/components/commerce/atomic-commerce-search-box/e2e/page-object.ts b/packages/atomic/src/components/commerce/atomic-commerce-search-box/e2e/page-object.ts
index 9c0763a49c6..03023dfaae6 100644
--- a/packages/atomic/src/components/commerce/atomic-commerce-search-box/e2e/page-object.ts
+++ b/packages/atomic/src/components/commerce/atomic-commerce-search-box/e2e/page-object.ts
@@ -6,6 +6,10 @@ export class SearchBoxPageObject extends BasePageObject<'atomic-commerce-search-
     super(page, 'atomic-commerce-search-box');
   }
 
+  get component() {
+    return this.page.locator('atomic-commerce-search-box');
+  }
+
   get submitButton() {
     return this.page.getByLabel('Search', {exact: true});
   }
diff --git a/packages/atomic/src/components/commerce/product-template-components/atomic-product-image/e2e/atomic-product-image.e2e.ts b/packages/atomic/src/components/commerce/product-template-components/atomic-product-image/e2e/atomic-product-image.e2e.ts
new file mode 100644
index 00000000000..c95f69122bf
--- /dev/null
+++ b/packages/atomic/src/components/commerce/product-template-components/atomic-product-image/e2e/atomic-product-image.e2e.ts
@@ -0,0 +1,12 @@
+// import {test, expect} from './fixture';
+
+// test.describe('default', async () => {
+//   test.describe('when clicking on the next button', async ({productImage}) => {
+//     test.fixme('should navigate to the next image', () => {});
+//     test.fixme('should not open the product', () => {});
+//   });
+//   test.describe('when clicking on the previous button', async ({productImage}) => {
+//     test.fixme('should navigate to the previous image', () => {});
+//     test.fixme('should not open the product', () => {});
+//   });
+// });
diff --git a/packages/atomic/src/components/commerce/product-template-components/atomic-product-image/e2e/fixture.ts b/packages/atomic/src/components/commerce/product-template-components/atomic-product-image/e2e/fixture.ts
new file mode 100644
index 00000000000..ca73e2a7976
--- /dev/null
+++ b/packages/atomic/src/components/commerce/product-template-components/atomic-product-image/e2e/fixture.ts
@@ -0,0 +1,18 @@
+import {test as base} from '@playwright/test';
+import {
+  AxeFixture,
+  makeAxeBuilder,
+} from '../../../../../../playwright-utils/base-fixture';
+import {ProductImageObject} from './page-object';
+
+interface TestFixture {
+  productImage: ProductImageObject;
+}
+
+export const test = base.extend<TestFixture & AxeFixture>({
+  makeAxeBuilder,
+  productImage: async ({page}, use) => {
+    await use(new ProductImageObject(page));
+  },
+});
+export {expect} from '@playwright/test';
diff --git a/packages/atomic/src/components/commerce/product-template-components/atomic-product-image/e2e/page-object.ts b/packages/atomic/src/components/commerce/product-template-components/atomic-product-image/e2e/page-object.ts
new file mode 100644
index 00000000000..30a89aebb3a
--- /dev/null
+++ b/packages/atomic/src/components/commerce/product-template-components/atomic-product-image/e2e/page-object.ts
@@ -0,0 +1,9 @@
+import type {Page} from '@playwright/test';
+import {BasePageObject} from '../../../../../../playwright-utils/base-page-object';
+
+export class ProductImageObject extends BasePageObject<'atomic-product-image'> {
+  constructor(page: Page) {
+    super(page, 'atomic-product-image');
+  }
+  // TODO tests
+}
diff --git a/packages/atomic/src/components/commerce/product-template/atomic-product-template.new.stories.tsx b/packages/atomic/src/components/commerce/product-template/atomic-product-template.new.stories.tsx
index 59ab137fb36..2d169ea774b 100644
--- a/packages/atomic/src/components/commerce/product-template/atomic-product-template.new.stories.tsx
+++ b/packages/atomic/src/components/commerce/product-template/atomic-product-template.new.stories.tsx
@@ -94,7 +94,7 @@ export const InASearchBoxInstantProducts: Story = {
     commerceInterfaceDecorator,
   ],
   play: async (context) => {
-    initializeCommerceInterface(context);
+    await initializeCommerceInterface(context);
     const {canvasElement, step} = context;
     const canvas = within(canvasElement);
     await step('Click Searchbox', async () => {
diff --git a/packages/atomic/src/components/commerce/search-box-suggestions/atomic-commerce-search-box-instant-products/atomic-commerce-search-box-instant-products.tsx b/packages/atomic/src/components/commerce/search-box-suggestions/atomic-commerce-search-box-instant-products/atomic-commerce-search-box-instant-products.tsx
index d644140fc69..8a871088e16 100644
--- a/packages/atomic/src/components/commerce/search-box-suggestions/atomic-commerce-search-box-instant-products/atomic-commerce-search-box-instant-products.tsx
+++ b/packages/atomic/src/components/commerce/search-box-suggestions/atomic-commerce-search-box-instant-products/atomic-commerce-search-box-instant-products.tsx
@@ -176,10 +176,10 @@ export class AtomicCommerceSearchBoxInstantProducts
         content: <InstantItemShowAllButton i18n={this.bindings.i18n} />,
         onSelect: () => {
           this.bindings.clearSuggestions();
-          this.bindings.searchBoxController.updateText(
-            this.instantProducts.state.query
-          );
-          this.bindings.searchBoxController.submit();
+          this.bindings
+            .searchBoxController()
+            .updateText(this.instantProducts.state.query);
+          this.bindings.searchBoxController().submit();
         },
       });
     }
@@ -226,7 +226,7 @@ export class AtomicCommerceSearchBoxInstantProducts
   private onSuggestedQueryChange() {
     if (
       !this.bindings.getSuggestionElements().length &&
-      !this.bindings.searchBoxController.state.value
+      !this.bindings.searchBoxController().state.value
     ) {
       console.warn(
         "There doesn't seem to be any query suggestions configured. Make sure to include either an atomic-commerce-search-box-query-suggestions or atomic-commerce-search-box-recent-queries in your search box in order to see some instant products."
diff --git a/packages/atomic/src/components/commerce/search-box-suggestions/atomic-commerce-search-box-query-suggestions/atomic-commerce-search-box-query-suggestions.tsx b/packages/atomic/src/components/commerce/search-box-suggestions/atomic-commerce-search-box-query-suggestions/atomic-commerce-search-box-query-suggestions.tsx
index fe892b4f80d..ab5f5add258 100644
--- a/packages/atomic/src/components/commerce/search-box-suggestions/atomic-commerce-search-box-query-suggestions/atomic-commerce-search-box-query-suggestions.tsx
+++ b/packages/atomic/src/components/commerce/search-box-suggestions/atomic-commerce-search-box-query-suggestions/atomic-commerce-search-box-query-suggestions.tsx
@@ -87,15 +87,16 @@ export class AtomicCommerceSearchBoxQuerySuggestions {
   }
 
   private renderItems(): SearchBoxSuggestionElement[] {
-    const hasQuery = this.bindings.searchBoxController.state.value !== '';
+    const hasQuery = this.bindings.searchBoxController().state.value !== '';
     const max = hasQuery ? this.maxWithQuery : this.maxWithoutQuery;
-    return this.bindings.searchBoxController.state.suggestions
-      .slice(0, max)
+    return this.bindings
+      .searchBoxController()
+      .state.suggestions.slice(0, max)
       .map((suggestion) => this.renderItem(suggestion));
   }
 
   private renderItem(suggestion: Suggestion) {
-    const hasQuery = this.bindings.searchBoxController.state.value !== '';
+    const hasQuery = this.bindings.searchBoxController().state.value !== '';
     const partialItem = getPartialSearchBoxSuggestionElement(
       suggestion,
       this.bindings.i18n
@@ -114,7 +115,9 @@ export class AtomicCommerceSearchBoxQuerySuggestions {
         </QuerySuggestionContainer>
       ),
       onSelect: () => {
-        this.bindings.searchBoxController.selectSuggestion(suggestion.rawValue);
+        this.bindings
+          .searchBoxController()
+          .selectSuggestion(suggestion.rawValue);
       },
     };
   }
diff --git a/packages/atomic/src/components/commerce/search-box-suggestions/atomic-commerce-search-box-recent-queries/atomic-commerce-search-box-recent-queries.tsx b/packages/atomic/src/components/commerce/search-box-suggestions/atomic-commerce-search-box-recent-queries/atomic-commerce-search-box-recent-queries.tsx
index b10687db4d6..9d7f67c8e9e 100644
--- a/packages/atomic/src/components/commerce/search-box-suggestions/atomic-commerce-search-box-recent-queries/atomic-commerce-search-box-recent-queries.tsx
+++ b/packages/atomic/src/components/commerce/search-box-suggestions/atomic-commerce-search-box-recent-queries/atomic-commerce-search-box-recent-queries.tsx
@@ -123,7 +123,7 @@ export class AtomicCommerceSearchBoxRecentQueries {
       return [];
     }
 
-    const query = this.bindings.searchBoxController.state.value;
+    const query = this.bindings.searchBoxController().state.value;
     const hasQuery = query !== '';
     const max = hasQuery ? this.maxWithQuery : this.maxWithoutQuery;
     const filteredQueries = this.recentQueriesList.state.queries
@@ -157,7 +157,7 @@ export class AtomicCommerceSearchBoxRecentQueries {
   }
 
   private renderItem(value: string): SearchBoxSuggestionElement {
-    const query = this.bindings.searchBoxController.state.value;
+    const query = this.bindings.searchBoxController().state.value;
     const partialItem = getPartialRecentQueryElement(value, this.bindings.i18n);
     return {
       ...partialItem,
@@ -169,9 +169,9 @@ export class AtomicCommerceSearchBoxRecentQueries {
       ),
 
       onSelect: () => {
-        if (this.bindings.isStandalone) {
-          this.bindings.searchBoxController.updateText(value);
-          this.bindings.searchBoxController.submit();
+        if (this.bindings.isStandalone()) {
+          this.bindings.searchBoxController().updateText(value);
+          this.bindings.searchBoxController().submit();
           return;
         }
 
diff --git a/packages/atomic/src/components/common/image-carousel/image-carousel.tsx b/packages/atomic/src/components/common/image-carousel/image-carousel.tsx
index 06f4063d248..6a812afccdc 100644
--- a/packages/atomic/src/components/common/image-carousel/image-carousel.tsx
+++ b/packages/atomic/src/components/common/image-carousel/image-carousel.tsx
@@ -27,7 +27,10 @@ export const ImageCarousel: FunctionalComponent<
       <Button
         style="text-primary"
         ariaLabel={props.bindings.i18n.t('previous')}
-        onClick={() => props.previousImage()}
+        onClick={(event) => {
+          event?.stopPropagation();
+          props.previousImage();
+        }}
         part="previous-button"
         class={`${commonPaginationClasses} left-0 ml-1`}
       >
@@ -44,7 +47,10 @@ export const ImageCarousel: FunctionalComponent<
       <Button
         style="text-primary"
         ariaLabel={props.bindings.i18n.t('next')}
-        onClick={() => props.nextImage()}
+        onClick={(event) => {
+          event?.stopPropagation();
+          props.nextImage();
+        }}
         part="next-button"
         class={`${commonPaginationClasses} right-0 mr-1`}
       >
diff --git a/packages/atomic/src/components/common/suggestions/suggestions-common.ts b/packages/atomic/src/components/common/suggestions/suggestions-common.ts
index de127841a3b..5a12198f1fa 100644
--- a/packages/atomic/src/components/common/suggestions/suggestions-common.ts
+++ b/packages/atomic/src/components/common/suggestions/suggestions-common.ts
@@ -141,11 +141,11 @@ export type SearchBoxSuggestionsBindings<
   /**
    * Whether the search box is [standalone](https://docs.coveo.com/en/atomic/latest/usage/ssb/).
    */
-  isStandalone: boolean;
+  isStandalone(): boolean;
   /**
    * The search box headless controller.
    */
-  searchBoxController: SearchBoxController;
+  searchBoxController(): SearchBoxController;
   /**
    * The number of queries to display when the user interacts with the search box.
    */
diff --git a/packages/atomic/src/components/search/atomic-search-box/atomic-search-box.new.stories.tsx b/packages/atomic/src/components/search/atomic-search-box/atomic-search-box.new.stories.tsx
index 65ae5f5f840..9268d8c69e0 100644
--- a/packages/atomic/src/components/search/atomic-search-box/atomic-search-box.new.stories.tsx
+++ b/packages/atomic/src/components/search/atomic-search-box/atomic-search-box.new.stories.tsx
@@ -1,7 +1,11 @@
 import {parameters} from '@coveo/atomic/storybookUtils/common/common-meta-parameters';
 import {renderComponent} from '@coveo/atomic/storybookUtils/common/render-component';
-import {wrapInSearchInterface} from '@coveo/atomic/storybookUtils/search/search-interface-wrapper';
+import {
+  playExecuteFirstSearch,
+  wrapInSearchInterface,
+} from '@coveo/atomic/storybookUtils/search/search-interface-wrapper';
 import type {Meta, StoryObj as Story} from '@storybook/web-components';
+import {html} from 'lit/static-html.js';
 
 const {decorator, play} = wrapInSearchInterface(
   {
@@ -43,3 +47,385 @@ export const RichSearchBox: Story = {
       ></atomic-search-box-instant-results>`,
   },
 };
+
+export const InPage: Story = {
+  name: 'In a page',
+  decorators: [
+    (story) =>
+      html`<atomic-search-layout>
+        <div class="header-bg"></div>
+        <atomic-layout-section section="search">
+          ${story()}
+        </atomic-layout-section>
+        <atomic-layout-section section="facets">
+          <atomic-facet-manager>
+            <atomic-automatic-facet-generator
+              desired-count="3"
+            ></atomic-automatic-facet-generator>
+            <atomic-category-facet
+              field="geographicalhierarchy"
+              label="World Atlas"
+              with-search
+            >
+            </atomic-category-facet>
+            <atomic-facet field="author" label="Authors"></atomic-facet>
+            <atomic-facet
+              field="source"
+              label="Source"
+              display-values-as="link"
+            ></atomic-facet>
+            <atomic-facet
+              field="year"
+              label="Year"
+              display-values-as="box"
+            ></atomic-facet>
+            <atomic-numeric-facet
+              field="ytviewcount"
+              label="Youtube Views"
+              depends-on-filetype="YouTubeVideo"
+              with-input="integer"
+            ></atomic-numeric-facet>
+            <atomic-numeric-facet
+              field="ytlikecount"
+              label="Youtube Likes"
+              depends-on-filetype="YouTubeVideo"
+              display-values-as="link"
+            >
+              <atomic-numeric-range
+                start="0"
+                end="1000"
+                label="Unpopular"
+              ></atomic-numeric-range>
+              <atomic-numeric-range
+                start="1000"
+                end="8000"
+                label="Well liked"
+              ></atomic-numeric-range>
+              <atomic-numeric-range
+                start="8000"
+                end="100000"
+                label="Popular"
+              ></atomic-numeric-range>
+              <atomic-numeric-range
+                start="100000"
+                end="999999999"
+                label="Treasured"
+              ></atomic-numeric-range>
+            </atomic-numeric-facet>
+            <atomic-numeric-facet field="sncost" label="Cost Range (auto)">
+              <atomic-format-currency currency="CAD"></atomic-format-currency>
+            </atomic-numeric-facet>
+            <atomic-timeframe-facet label="Timeframe" with-date-picker>
+              <atomic-timeframe unit="hour"></atomic-timeframe>
+              <atomic-timeframe unit="day"></atomic-timeframe>
+              <atomic-timeframe unit="week"></atomic-timeframe>
+              <atomic-timeframe unit="month"></atomic-timeframe>
+              <atomic-timeframe unit="quarter"></atomic-timeframe>
+              <atomic-timeframe unit="year"></atomic-timeframe>
+              <atomic-timeframe
+                unit="year"
+                amount="10"
+                period="next"
+              ></atomic-timeframe>
+            </atomic-timeframe-facet>
+            <atomic-rating-facet
+              field="snrating"
+              label="Rating"
+              number-of-intervals="5"
+            >
+            </atomic-rating-facet>
+            <atomic-rating-range-facet
+              facet-id="snrating_range"
+              field="snrating"
+              label="Rating Range (auto)"
+              number-of-intervals="5"
+            >
+            </atomic-rating-range-facet>
+            <atomic-color-facet
+              field="filetype"
+              label="Files"
+              number-of-values="6"
+              sort-criteria="occurrences"
+            ></atomic-color-facet>
+          </atomic-facet-manager>
+        </atomic-layout-section>
+        <atomic-layout-section section="main">
+          <atomic-layout-section section="horizontal-facets">
+            <atomic-segmented-facet-scrollable>
+              <atomic-segmented-facet
+                field="inat_kingdom"
+                label="Kingdom"
+              ></atomic-segmented-facet>
+            </atomic-segmented-facet-scrollable>
+            <atomic-popover>
+              <atomic-facet
+                field="inat_family"
+                label="Family"
+                sort-criteria="alphanumericDescending"
+              ></atomic-facet>
+            </atomic-popover>
+            <atomic-popover>
+              <atomic-facet field="inat_class" label="Class"></atomic-facet>
+            </atomic-popover>
+          </atomic-layout-section>
+          <atomic-layout-section section="status">
+            <atomic-breadbox></atomic-breadbox>
+            <atomic-query-summary></atomic-query-summary>
+            <atomic-refine-toggle></atomic-refine-toggle>
+            <atomic-sort-dropdown>
+              <atomic-sort-expression
+                label="relevance"
+                expression="relevancy"
+              ></atomic-sort-expression>
+            </atomic-sort-dropdown>
+            <atomic-did-you-mean
+              query-correction-mode="next"
+            ></atomic-did-you-mean>
+            <atomic-notifications></atomic-notifications>
+          </atomic-layout-section>
+          <atomic-layout-section section="results">
+            <atomic-smart-snippet></atomic-smart-snippet>
+            <atomic-smart-snippet-suggestions></atomic-smart-snippet-suggestions>
+            <atomic-result-list>
+              <atomic-result-template must-match-sourcetype="YouTube">
+                <template>
+                  <atomic-result-section-actions
+                    ><atomic-quickview></atomic-quickview
+                  ></atomic-result-section-actions>
+                  <atomic-result-section-visual image-size="small">
+                    <img
+                      loading="lazy"
+                      src="https://picsum.photos/350"
+                      class="thumbnail"
+                    />
+                  </atomic-result-section-visual>
+                  <atomic-result-section-title
+                    ><atomic-result-link></atomic-result-link
+                  ></atomic-result-section-title>
+                  <atomic-result-section-excerpt
+                    ><atomic-result-text field="excerpt"></atomic-result-text
+                  ></atomic-result-section-excerpt>
+                </template>
+              </atomic-result-template>
+
+              <atomic-result-template>
+                <template>
+                  <style>
+                    .field {
+                      display: inline-flex;
+                      align-items: center;
+                    }
+
+                    .field-label {
+                      font-weight: bold;
+                      margin-right: 0.25rem;
+                    }
+
+                    .thumbnail {
+                      display: none;
+                      width: 100%;
+                      height: 100%;
+                    }
+
+                    .icon {
+                      display: none;
+                    }
+
+                    .result-root.image-small .thumbnail,
+                    .result-root.image-large .thumbnail {
+                      display: inline-block;
+                    }
+
+                    .result-root.image-icon .icon {
+                      display: inline-block;
+                    }
+
+                    .result-root.image-small atomic-result-section-visual,
+                    .result-root.image-large atomic-result-section-visual {
+                      border-radius: var(--atomic-border-radius-xl);
+                    }
+
+                    .salesforce-badge::part(result-badge-element) {
+                      background-color: #44a1da;
+                      color: white;
+                    }
+                  </style>
+                  <atomic-result-section-actions
+                    ><atomic-quickview></atomic-quickview
+                  ></atomic-result-section-actions>
+                  <atomic-result-section-visual>
+                    <atomic-result-icon class="icon"></atomic-result-icon>
+                    <img
+                      loading="lazy"
+                      src="https://picsum.photos/350"
+                      class="thumbnail"
+                    />
+                  </atomic-result-section-visual>
+                  <atomic-result-section-badges>
+                    <atomic-field-condition must-match-sourcetype="Salesforce">
+                      <atomic-result-badge
+                        label="Salesforce"
+                        class="salesforce-badge"
+                      ></atomic-result-badge>
+                    </atomic-field-condition>
+                    <atomic-result-badge
+                      icon="https://raw.githubusercontent.com/Rush/Font-Awesome-SVG-PNG/master/black/svg/language.svg"
+                    >
+                      <atomic-result-multi-value-text
+                        field="language"
+                      ></atomic-result-multi-value-text>
+                    </atomic-result-badge>
+                    <atomic-field-condition must-match-is-recommendation="true">
+                      <atomic-result-badge
+                        label="Recommended"
+                      ></atomic-result-badge>
+                    </atomic-field-condition>
+                    <atomic-field-condition must-match-is-top-result="true">
+                      <atomic-result-badge
+                        label="Top Result"
+                      ></atomic-result-badge>
+                    </atomic-field-condition>
+                  </atomic-result-section-badges>
+                  <atomic-result-section-title
+                    ><atomic-result-link></atomic-result-link
+                  ></atomic-result-section-title>
+                  <atomic-result-section-title-metadata>
+                    <atomic-field-condition class="field" if-defined="snrating">
+                      <atomic-result-rating
+                        field="snrating"
+                      ></atomic-result-rating>
+                    </atomic-field-condition>
+                    <atomic-field-condition
+                      class="field"
+                      if-not-defined="snrating"
+                    >
+                      <atomic-result-printable-uri
+                        max-number-of-parts="3"
+                      ></atomic-result-printable-uri>
+                    </atomic-field-condition>
+                  </atomic-result-section-title-metadata>
+                  <atomic-result-section-excerpt
+                    ><atomic-result-text field="excerpt"></atomic-result-text
+                  ></atomic-result-section-excerpt>
+                  <atomic-result-section-bottom-metadata>
+                    <atomic-result-fields-list>
+                      <atomic-field-condition class="field" if-defined="author">
+                        <span class="field-label"
+                          ><atomic-text value="author"></atomic-text>:</span
+                        >
+                        <atomic-result-multi-value-text
+                          field="author"
+                        ></atomic-result-multi-value-text>
+                      </atomic-field-condition>
+
+                      <atomic-field-condition class="field" if-defined="source">
+                        <span class="field-label"
+                          ><atomic-text value="source"></atomic-text>:</span
+                        >
+                        <atomic-result-text field="source"></atomic-result-text>
+                      </atomic-field-condition>
+
+                      <atomic-field-condition
+                        class="field"
+                        if-defined="language"
+                      >
+                        <span class="field-label"
+                          ><atomic-text value="language"></atomic-text>:</span
+                        >
+                        <atomic-result-multi-value-text
+                          field="language"
+                        ></atomic-result-multi-value-text>
+                      </atomic-field-condition>
+
+                      <atomic-field-condition
+                        class="field"
+                        if-defined="filetype"
+                      >
+                        <span class="field-label"
+                          ><atomic-text value="fileType"></atomic-text>:</span
+                        >
+                        <atomic-result-text
+                          field="filetype"
+                        ></atomic-result-text>
+                      </atomic-field-condition>
+
+                      <atomic-field-condition class="field" if-defined="sncost">
+                        <span class="field-label">Cost:</span>
+                        <atomic-result-number field="sncost">
+                          <atomic-format-currency
+                            currency="CAD"
+                          ></atomic-format-currency>
+                        </atomic-result-number>
+                      </atomic-field-condition>
+
+                      <span class="field">
+                        <span class="field-label">Date:</span>
+                        <atomic-result-date
+                          format="ddd MMM D YYYY"
+                        ></atomic-result-date>
+                      </span>
+                    </atomic-result-fields-list>
+                  </atomic-result-section-bottom-metadata>
+                  <atomic-table-element label="Description">
+                    <atomic-result-section-title
+                      ><atomic-result-link></atomic-result-link
+                    ></atomic-result-section-title>
+                    <atomic-result-section-title-metadata>
+                      <atomic-field-condition
+                        class="field"
+                        if-defined="snrating"
+                      >
+                        <atomic-result-rating
+                          field="snrating"
+                        ></atomic-result-rating>
+                      </atomic-field-condition>
+                      <atomic-field-condition
+                        class="field"
+                        if-not-defined="snrating"
+                      >
+                        <atomic-result-printable-uri
+                          max-number-of-parts="3"
+                        ></atomic-result-printable-uri>
+                      </atomic-field-condition>
+                    </atomic-result-section-title-metadata>
+                    <atomic-result-section-excerpt>
+                      <atomic-result-text field="excerpt"></atomic-result-text>
+                    </atomic-result-section-excerpt>
+                  </atomic-table-element>
+                  <atomic-table-element label="author">
+                    <atomic-result-multi-value-text
+                      field="author"
+                    ></atomic-result-multi-value-text>
+                  </atomic-table-element>
+                  <atomic-table-element label="source">
+                    <atomic-result-text field="source"></atomic-result-text>
+                  </atomic-table-element>
+                  <atomic-table-element label="language">
+                    <atomic-result-multi-value-text
+                      field="language"
+                    ></atomic-result-multi-value-text>
+                  </atomic-table-element>
+                  <atomic-table-element label="file-type">
+                    <atomic-result-text field="filetype"></atomic-result-text>
+                  </atomic-table-element>
+                </template>
+              </atomic-result-template>
+            </atomic-result-list>
+            <atomic-query-error></atomic-query-error>
+            <atomic-no-results></atomic-no-results>
+          </atomic-layout-section>
+          <atomic-layout-section section="pagination">
+            <atomic-load-more-results></atomic-load-more-results>
+            <!-- Alternative pagination
+              <atomic-pager></atomic-pager>
+              <atomic-results-per-page></atomic-results-per-page>
+              -->
+          </atomic-layout-section>
+        </atomic-layout-section>
+      </atomic-search-layout>`,
+  ],
+  play: async (context) => {
+    await play(context);
+    await playExecuteFirstSearch(context);
+  },
+};
diff --git a/packages/atomic/src/components/search/atomic-search-box/atomic-search-box.tsx b/packages/atomic/src/components/search/atomic-search-box/atomic-search-box.tsx
index 154410738de..f30cc025266 100644
--- a/packages/atomic/src/components/search/atomic-search-box/atomic-search-box.tsx
+++ b/packages/atomic/src/components/search/atomic-search-box/atomic-search-box.tsx
@@ -237,28 +237,44 @@ export class AtomicSearchBox implements InitializableComponent<Bindings> {
   @AriaLiveRegion('search-suggestions', true)
   protected suggestionsAriaMessage!: string;
 
+  private isStandaloneSearchBox(
+    searchBox: SearchBox | StandaloneSearchBox
+  ): searchBox is StandaloneSearchBox {
+    return 'redirectTo' in searchBox;
+  }
+
   public initialize() {
-    this.id = randomID('atomic-search-box-');
+    this.id ??= randomID('atomic-search-box-');
 
-    if (!this.textarea) {
-      this.bindings.engine.logger.warn(
-        'As of Atomic version 3.0.0, the searchbox will be enabled as a text area by default. To remove this warning, set textarea="true" on the search box.',
-        this.host
-      );
+    this.initializeSearchboxController();
+    this.initializeSuggestionManager();
+  }
+
+  private updateRedirectionUrl() {
+    if (this.isStandaloneSearchBox(this.searchBox) && this.redirectionUrl) {
+      this.searchBox.updateRedirectUrl(this.redirectionUrl);
+    } else {
+      this.registerNewSearchBoxController();
     }
+  }
 
+  private registerNewSearchBoxController() {
+    this.disconnectedCallback();
+    this.initialize();
+  }
+
+  private initializeSearchboxController() {
     this.searchBox = this.redirectionUrl
       ? buildStandaloneSearchBox(this.bindings.engine, {
           options: {
             ...this.searchBoxOptions,
             redirectionUrl: this.redirectionUrl,
+            overwrite: true,
           },
         })
       : buildSearchBox(this.bindings.engine, {
           options: this.searchBoxOptions,
         });
-
-    this.initializeSuggestionManager();
   }
 
   public componentWillUpdate() {
@@ -289,6 +305,8 @@ export class AtomicSearchBox implements InitializableComponent<Bindings> {
     }
   }
 
+  public disconnectedCallback = () => {};
+
   @Listen('atomic/searchBoxSuggestion/register')
   public registerSuggestions(
     event: CustomEvent<
@@ -305,7 +323,7 @@ export class AtomicSearchBox implements InitializableComponent<Bindings> {
     }
   }
 
-  public componentWillRender() {
+  private registerSearchboxSuggestionEvents() {
     this.searchBoxSuggestionEventsQueue.forEach((evt) => {
       this.suggestionManager.registerSuggestionsFromEvent(
         evt,
@@ -317,7 +335,7 @@ export class AtomicSearchBox implements InitializableComponent<Bindings> {
 
   @Watch('redirectionUrl')
   watchRedirectionUrl() {
-    this.initialize();
+    this.updateRedirectionUrl();
   }
 
   private initializeSuggestionManager() {
@@ -358,8 +376,8 @@ export class AtomicSearchBox implements InitializableComponent<Bindings> {
     return {
       ...this.bindings,
       id: this.id,
-      isStandalone: !!this.redirectionUrl,
-      searchBoxController: this.searchBox,
+      isStandalone: () => !!this.redirectionUrl,
+      searchBoxController: () => this.searchBox,
       numberOfQueries: this.numberOfQueries,
       clearFilters: this.clearFilters,
     };
@@ -710,6 +728,9 @@ export class AtomicSearchBox implements InitializableComponent<Bindings> {
     const isDisabled = this.isSearchDisabledForEndUser(
       this.searchBoxState.value
     );
+    if (!this.suggestionManager.suggestions.length) {
+      this.registerSearchboxSuggestionEvents();
+    }
 
     return (
       <Host>
diff --git a/packages/atomic/src/components/search/atomic-search-box/e2e/atomic-search-box.e2e.ts b/packages/atomic/src/components/search/atomic-search-box/e2e/atomic-search-box.e2e.ts
index 3f66cbed78b..71d19516183 100644
--- a/packages/atomic/src/components/search/atomic-search-box/e2e/atomic-search-box.e2e.ts
+++ b/packages/atomic/src/components/search/atomic-search-box/e2e/atomic-search-box.e2e.ts
@@ -126,6 +126,33 @@ test.describe('with instant results & query suggestions', () => {
         await expect(searchBox.searchInput).toHaveValue('shoe');
       });
     });
+
+    test.describe('after updating the redirect-url attribute', () => {
+      test.beforeEach(async ({searchBox}) => {
+        await searchBox.component.evaluate((node) =>
+          node.setAttribute(
+            'redirection-url',
+            './iframe.html?id=atomic-search-box--in-page&viewMode=story&args=enable-query-syntax:!true;suggestion-timeout:5000'
+          )
+        );
+      });
+
+      test('should redirect to the specified url after selecting a suggestion', async ({
+        page,
+        searchBox,
+      }) => {
+        const suggestionText = await searchBox
+          .searchSuggestions()
+          .first()
+          .textContent();
+
+        expect(suggestionText).not.toBeNull();
+
+        await searchBox.searchSuggestions().first().click();
+        await page.waitForURL('**/iframe.html?id=atomic-search-box--in-page*');
+        await expect(searchBox.searchInput).toHaveValue(suggestionText ?? '');
+      });
+    });
   });
 });
 
diff --git a/packages/atomic/src/components/search/atomic-search-box/e2e/page-object.ts b/packages/atomic/src/components/search/atomic-search-box/e2e/page-object.ts
index 21d70ac95a6..db5ee4cd0c2 100644
--- a/packages/atomic/src/components/search/atomic-search-box/e2e/page-object.ts
+++ b/packages/atomic/src/components/search/atomic-search-box/e2e/page-object.ts
@@ -6,6 +6,10 @@ export class SearchBoxPageObject extends BasePageObject<'atomic-search-box'> {
     super(page, 'atomic-search-box');
   }
 
+  get component() {
+    return this.page.locator('atomic-search-box');
+  }
+
   get submitButton() {
     return this.page.getByLabel('Search', {exact: true});
   }
diff --git a/packages/atomic/src/components/search/facets/atomic-category-facet/atomic-category-facet.tsx b/packages/atomic/src/components/search/facets/atomic-category-facet/atomic-category-facet.tsx
index 9c7bd1c3ba8..6d8de127bc4 100644
--- a/packages/atomic/src/components/search/facets/atomic-category-facet/atomic-category-facet.tsx
+++ b/packages/atomic/src/components/search/facets/atomic-category-facet/atomic-category-facet.tsx
@@ -16,7 +16,15 @@ import {
   TabManager,
   buildTabManager,
 } from '@coveo/headless';
-import {Component, h, State, Prop, Element, Fragment} from '@stencil/core';
+import {
+  Component,
+  h,
+  State,
+  Prop,
+  Element,
+  Fragment,
+  Watch,
+} from '@stencil/core';
 import {
   AriaLiveRegion,
   FocusTargetController,
@@ -340,17 +348,26 @@ export class AtomicCategoryFacet implements InitializableComponent {
     );
   }
 
+  @Watch('tabManagerState')
+  watchTabManagerState(
+    newValue: {activeTab: string},
+    oldValue: {activeTab: string}
+  ) {
+    if (newValue?.activeTab !== oldValue?.activeTab) {
+      updateFacetVisibilityForActiveTab(
+        [...this.tabsIncluded],
+        [...this.tabsExcluded],
+        this.tabManagerState?.activeTab,
+        this.facet
+      );
+    }
+  }
+
   public componentShouldUpdate(
     next: unknown,
     prev: unknown,
     propName: keyof AtomicCategoryFacet
   ) {
-    updateFacetVisibilityForActiveTab(
-      [...this.tabsIncluded],
-      [...this.tabsExcluded],
-      this.tabManagerState?.activeTab,
-      this.facet
-    );
     if (
       this.isCategoryFacetState(prev, propName) &&
       this.isCategoryFacetState(next, propName)
diff --git a/packages/atomic/src/components/search/facets/atomic-color-facet/atomic-color-facet.tsx b/packages/atomic/src/components/search/facets/atomic-color-facet/atomic-color-facet.tsx
index 8fd09d948bd..928b6a4848f 100644
--- a/packages/atomic/src/components/search/facets/atomic-color-facet/atomic-color-facet.tsx
+++ b/packages/atomic/src/components/search/facets/atomic-color-facet/atomic-color-facet.tsx
@@ -17,7 +17,7 @@ import {
   TabManager,
   TabManagerState,
 } from '@coveo/headless';
-import {Component, h, State, Prop, VNode, Element} from '@stencil/core';
+import {Component, h, State, Prop, VNode, Element, Watch} from '@stencil/core';
 import {
   AriaLiveRegion,
   FocusTargetController,
@@ -348,17 +348,26 @@ export class AtomicColorFacet implements InitializableComponent {
     );
   }
 
+  @Watch('tabManagerState')
+  watchTabManagerState(
+    newValue: {activeTab: string},
+    oldValue: {activeTab: string}
+  ) {
+    if (newValue?.activeTab !== oldValue?.activeTab) {
+      updateFacetVisibilityForActiveTab(
+        [...this.tabsIncluded],
+        [...this.tabsExcluded],
+        this.tabManagerState?.activeTab,
+        this.facet
+      );
+    }
+  }
+
   public componentShouldUpdate(
     next: unknown,
     prev: unknown,
     propName: keyof AtomicColorFacet
   ) {
-    updateFacetVisibilityForActiveTab(
-      [...this.tabsIncluded],
-      [...this.tabsExcluded],
-      this.tabManagerState?.activeTab,
-      this.facet
-    );
     if (propName === 'facetState' && prev && this.withSearch) {
       return shouldUpdateFacetSearchComponent(
         (next as FacetState).facetSearch,
diff --git a/packages/atomic/src/components/search/facets/atomic-facet/atomic-facet.tsx b/packages/atomic/src/components/search/facets/atomic-facet/atomic-facet.tsx
index 59f0da75440..ec05e74d226 100644
--- a/packages/atomic/src/components/search/facets/atomic-facet/atomic-facet.tsx
+++ b/packages/atomic/src/components/search/facets/atomic-facet/atomic-facet.tsx
@@ -24,6 +24,7 @@ import {
   Element,
   VNode,
   Fragment,
+  Watch,
 } from '@stencil/core';
 import {
   AriaLiveRegion,
@@ -317,17 +318,26 @@ export class AtomicFacet implements InitializableComponent {
     this.facetConditionsManager?.stopWatching();
   }
 
+  @Watch('tabManagerState')
+  watchTabManagerState(
+    newValue: {activeTab: string},
+    oldValue: {activeTab: string}
+  ) {
+    if (newValue?.activeTab !== oldValue?.activeTab) {
+      updateFacetVisibilityForActiveTab(
+        [...this.tabsIncluded],
+        [...this.tabsExcluded],
+        this.tabManagerState?.activeTab,
+        this.facet
+      );
+    }
+  }
+
   public componentShouldUpdate(
-    next: unknown,
-    prev: unknown,
+    next: FacetState,
+    prev: FacetState,
     propName: keyof AtomicFacet
   ) {
-    updateFacetVisibilityForActiveTab(
-      [...this.tabsIncluded],
-      [...this.tabsExcluded],
-      this.tabManagerState?.activeTab,
-      this.facet
-    );
     if (
       this.isFacetState(prev, propName) &&
       this.isFacetState(next, propName)
diff --git a/packages/atomic/src/components/search/facets/atomic-numeric-facet/atomic-numeric-facet.tsx b/packages/atomic/src/components/search/facets/atomic-numeric-facet/atomic-numeric-facet.tsx
index 4d95d50f974..6f0d9857da0 100644
--- a/packages/atomic/src/components/search/facets/atomic-numeric-facet/atomic-numeric-facet.tsx
+++ b/packages/atomic/src/components/search/facets/atomic-numeric-facet/atomic-numeric-facet.tsx
@@ -22,7 +22,7 @@ import {
   TabManager,
   TabManagerState,
 } from '@coveo/headless';
-import {Component, Element, h, Listen, Prop, State} from '@stencil/core';
+import {Component, Element, h, Listen, Prop, State, Watch} from '@stencil/core';
 import {FocusTargetController} from '../../../../utils/accessibility-utils';
 import {
   BindStateToController,
@@ -265,13 +265,19 @@ export class AtomicNumericFacet implements InitializableComponent {
     this.tabManager = buildTabManager(this.bindings.engine);
   }
 
-  public componentShouldUpdate(): void {
-    updateFacetVisibilityForActiveTab(
-      [...this.tabsIncluded],
-      [...this.tabsExcluded],
-      this.tabManagerState?.activeTab,
-      this.facetForRange
-    );
+  @Watch('tabManagerState')
+  watchTabManagerState(
+    newValue: {activeTab: string},
+    oldValue: {activeTab: string}
+  ) {
+    if (newValue?.activeTab !== oldValue?.activeTab) {
+      updateFacetVisibilityForActiveTab(
+        [...this.tabsIncluded],
+        [...this.tabsExcluded],
+        this.tabManagerState?.activeTab,
+        this.facetForRange
+      );
+    }
   }
 
   private initializeFacetForInput() {
diff --git a/packages/atomic/src/components/search/facets/atomic-rating-facet/atomic-rating-facet.tsx b/packages/atomic/src/components/search/facets/atomic-rating-facet/atomic-rating-facet.tsx
index b65b0d1ef83..994b5beaa56 100644
--- a/packages/atomic/src/components/search/facets/atomic-rating-facet/atomic-rating-facet.tsx
+++ b/packages/atomic/src/components/search/facets/atomic-rating-facet/atomic-rating-facet.tsx
@@ -18,7 +18,7 @@ import {
   TabManager,
   TabManagerState,
 } from '@coveo/headless';
-import {Component, h, State, Prop, VNode, Element} from '@stencil/core';
+import {Component, h, State, Prop, VNode, Element, Watch} from '@stencil/core';
 import Star from '../../../../images/star.svg';
 import {FocusTargetController} from '../../../../utils/accessibility-utils';
 import {
@@ -271,13 +271,19 @@ export class AtomicRatingFacet implements InitializableComponent {
     this.dependenciesManager?.stopWatching();
   }
 
-  public componentShouldUpdate(): void {
-    updateFacetVisibilityForActiveTab(
-      [...this.tabsIncluded],
-      [...this.tabsExcluded],
-      this.tabManagerState?.activeTab,
-      this.facet
-    );
+  @Watch('tabManagerState')
+  watchTabManagerState(
+    newValue: {activeTab: string},
+    oldValue: {activeTab: string}
+  ) {
+    if (newValue?.activeTab !== oldValue?.activeTab) {
+      updateFacetVisibilityForActiveTab(
+        [...this.tabsIncluded],
+        [...this.tabsExcluded],
+        this.tabManagerState?.activeTab,
+        this.facet
+      );
+    }
   }
 
   private get isHidden() {
diff --git a/packages/atomic/src/components/search/facets/atomic-rating-range-facet/atomic-rating-range-facet.tsx b/packages/atomic/src/components/search/facets/atomic-rating-range-facet/atomic-rating-range-facet.tsx
index f15880bb917..37d4738a24b 100644
--- a/packages/atomic/src/components/search/facets/atomic-rating-range-facet/atomic-rating-range-facet.tsx
+++ b/packages/atomic/src/components/search/facets/atomic-rating-range-facet/atomic-rating-range-facet.tsx
@@ -17,7 +17,7 @@ import {
   TabManager,
   TabManagerState,
 } from '@coveo/headless';
-import {Component, h, State, Prop, VNode, Element} from '@stencil/core';
+import {Component, h, State, Prop, VNode, Element, Watch} from '@stencil/core';
 import Star from '../../../../images/star.svg';
 import {FocusTargetController} from '../../../../utils/accessibility-utils';
 import {
@@ -214,16 +214,20 @@ export class AtomicRatingRangeFacet implements InitializableComponent {
     this.initializeFacet();
     this.initializeDependenciesManager();
   }
-
-  public componentShouldUpdate(): void {
-    updateFacetVisibilityForActiveTab(
-      [...this.tabsIncluded],
-      [...this.tabsExcluded],
-      this.tabManagerState?.activeTab,
-      this.facet
-    );
+  @Watch('tabManagerState')
+  watchTabManagerState(
+    newValue: {activeTab: string},
+    oldValue: {activeTab: string}
+  ) {
+    if (newValue?.activeTab !== oldValue?.activeTab) {
+      updateFacetVisibilityForActiveTab(
+        [...this.tabsIncluded],
+        [...this.tabsExcluded],
+        this.tabManagerState?.activeTab,
+        this.facet
+      );
+    }
   }
-
   public disconnectedCallback() {
     if (this.host.isConnected) {
       return;
diff --git a/packages/atomic/src/components/search/facets/atomic-segmented-facet/atomic-segmented-facet.tsx b/packages/atomic/src/components/search/facets/atomic-segmented-facet/atomic-segmented-facet.tsx
index 59beb71c393..bc9e55d25e7 100644
--- a/packages/atomic/src/components/search/facets/atomic-segmented-facet/atomic-segmented-facet.tsx
+++ b/packages/atomic/src/components/search/facets/atomic-segmented-facet/atomic-segmented-facet.tsx
@@ -16,7 +16,7 @@ import {
   TabManager,
   TabManagerState,
 } from '@coveo/headless';
-import {Component, h, Prop, State, VNode} from '@stencil/core';
+import {Component, h, Prop, State, VNode, Watch} from '@stencil/core';
 import {getFieldValueCaption} from '../../../../utils/field-utils';
 import {
   BindStateToController,
@@ -215,13 +215,19 @@ export class AtomicSegmentedFacet implements InitializableComponent {
     );
   }
 
-  public componentShouldUpdate(): void {
-    updateFacetVisibilityForActiveTab(
-      [...this.tabsIncluded],
-      [...this.tabsExcluded],
-      this.tabManagerState?.activeTab,
-      this.facet
-    );
+  @Watch('tabManagerState')
+  watchTabManagerState(
+    newValue: {activeTab: string},
+    oldValue: {activeTab: string}
+  ) {
+    if (newValue?.activeTab !== oldValue?.activeTab) {
+      updateFacetVisibilityForActiveTab(
+        [...this.tabsIncluded],
+        [...this.tabsExcluded],
+        this.tabManagerState?.activeTab,
+        this.facet
+      );
+    }
   }
 
   disconnectedCallback() {
diff --git a/packages/atomic/src/components/search/facets/atomic-timeframe-facet/atomic-timeframe-facet.tsx b/packages/atomic/src/components/search/facets/atomic-timeframe-facet/atomic-timeframe-facet.tsx
index 2478c398f26..f624c80eeb7 100644
--- a/packages/atomic/src/components/search/facets/atomic-timeframe-facet/atomic-timeframe-facet.tsx
+++ b/packages/atomic/src/components/search/facets/atomic-timeframe-facet/atomic-timeframe-facet.tsx
@@ -20,7 +20,7 @@ import {
   TabManager,
   TabManagerState,
 } from '@coveo/headless';
-import {Component, Element, h, Listen, Prop, State} from '@stencil/core';
+import {Component, Element, h, Listen, Prop, State, Watch} from '@stencil/core';
 import {FocusTargetController} from '../../../../utils/accessibility-utils';
 import {
   BindStateToController,
@@ -256,13 +256,19 @@ export class AtomicTimeframeFacet implements InitializableComponent {
     this.tabManager = buildTabManager(this.bindings.engine);
   }
 
-  public componentShouldUpdate(): void {
-    updateFacetVisibilityForActiveTab(
-      [...this.tabsIncluded],
-      [...this.tabsExcluded],
-      this.tabManagerState?.activeTab,
-      this.facetForDateRange
-    );
+  @Watch('tabManagerState')
+  watchTabManagerState(
+    newValue: {activeTab: string},
+    oldValue: {activeTab: string}
+  ) {
+    if (newValue?.activeTab !== oldValue?.activeTab) {
+      updateFacetVisibilityForActiveTab(
+        [...this.tabsIncluded],
+        [...this.tabsExcluded],
+        this.tabManagerState?.activeTab,
+        this.facetForDateRange
+      );
+    }
   }
 
   public disconnectedCallback() {
diff --git a/packages/atomic/src/components/search/search-box-suggestions/atomic-search-box-instant-results/atomic-search-box-instant-results.tsx b/packages/atomic/src/components/search/search-box-suggestions/atomic-search-box-instant-results/atomic-search-box-instant-results.tsx
index 7e05b507da5..f1a9a9b0caf 100644
--- a/packages/atomic/src/components/search/search-box-suggestions/atomic-search-box-instant-results/atomic-search-box-instant-results.tsx
+++ b/packages/atomic/src/components/search/search-box-suggestions/atomic-search-box-instant-results/atomic-search-box-instant-results.tsx
@@ -178,10 +178,10 @@ export class AtomicSearchBoxInstantResults implements InitializableComponent {
         content: <InstantItemShowAllButton i18n={this.bindings.i18n} />,
         onSelect: () => {
           this.bindings.clearSuggestions();
-          this.bindings.searchBoxController.updateText(
-            this.instantResults.state.q
-          );
-          this.bindings.searchBoxController.submit();
+          this.bindings
+            .searchBoxController()
+            .updateText(this.instantResults.state.q);
+          this.bindings.searchBoxController().submit();
         },
       });
     }
@@ -223,7 +223,7 @@ export class AtomicSearchBoxInstantResults implements InitializableComponent {
   private onSuggestedQueryChange() {
     if (
       !this.bindings.getSuggestionElements().length &&
-      !this.bindings.searchBoxController.state.value
+      !this.bindings.searchBoxController().state.value
     ) {
       console.warn(
         "There doesn't seem to be any query suggestions configured. Make sure to include either an atomic-search-box-query-suggestions or atomic-search-box-recent-queries in your search box in order to see some instant results."
diff --git a/packages/atomic/src/components/search/search-box-suggestions/atomic-search-box-query-suggestions/atomic-search-box-query-suggestions.tsx b/packages/atomic/src/components/search/search-box-suggestions/atomic-search-box-query-suggestions/atomic-search-box-query-suggestions.tsx
index 107793f3ef4..3dbad9a8ca6 100644
--- a/packages/atomic/src/components/search/search-box-suggestions/atomic-search-box-query-suggestions/atomic-search-box-query-suggestions.tsx
+++ b/packages/atomic/src/components/search/search-box-suggestions/atomic-search-box-query-suggestions/atomic-search-box-query-suggestions.tsx
@@ -92,15 +92,16 @@ export class AtomicSearchBoxQuerySuggestions {
   }
 
   private renderItems(): SearchBoxSuggestionElement[] {
-    const hasQuery = this.bindings.searchBoxController.state.value !== '';
+    const hasQuery = this.bindings.searchBoxController().state.value !== '';
     const max = hasQuery ? this.maxWithQuery : this.maxWithoutQuery;
-    return this.bindings.searchBoxController.state.suggestions
-      .slice(0, max)
+    return this.bindings
+      .searchBoxController()
+      .state.suggestions.slice(0, max)
       .map((suggestion) => this.renderItem(suggestion));
   }
 
   private renderItem(suggestion: Suggestion) {
-    const hasQuery = this.bindings.searchBoxController.state.value !== '';
+    const hasQuery = this.bindings.searchBoxController().state.value !== '';
     const partialItem = getPartialSearchBoxSuggestionElement(
       suggestion,
       this.bindings.i18n
@@ -119,7 +120,9 @@ export class AtomicSearchBoxQuerySuggestions {
         </QuerySuggestionContainer>
       ),
       onSelect: () => {
-        this.bindings.searchBoxController.selectSuggestion(suggestion.rawValue);
+        this.bindings
+          .searchBoxController()
+          .selectSuggestion(suggestion.rawValue);
       },
     };
   }
diff --git a/packages/atomic/src/components/search/search-box-suggestions/atomic-search-box-recent-queries/atomic-search-box-recent-queries.tsx b/packages/atomic/src/components/search/search-box-suggestions/atomic-search-box-recent-queries/atomic-search-box-recent-queries.tsx
index b497cfcd7a3..cd79c6b7a16 100644
--- a/packages/atomic/src/components/search/search-box-suggestions/atomic-search-box-recent-queries/atomic-search-box-recent-queries.tsx
+++ b/packages/atomic/src/components/search/search-box-suggestions/atomic-search-box-recent-queries/atomic-search-box-recent-queries.tsx
@@ -121,7 +121,7 @@ export class AtomicSearchBoxRecentQueries {
       return [];
     }
 
-    const query = this.bindings.searchBoxController.state.value;
+    const query = this.bindings.searchBoxController().state.value;
     const hasQuery = query !== '';
     const max = hasQuery ? this.maxWithQuery : this.maxWithoutQuery;
     const filteredQueries = this.recentQueriesList.state.queries
@@ -155,7 +155,7 @@ export class AtomicSearchBoxRecentQueries {
   }
 
   private renderItem(value: string): SearchBoxSuggestionElement {
-    const query = this.bindings.searchBoxController.state.value;
+    const query = this.bindings.searchBoxController().state.value;
     const partialItem = getPartialRecentQueryElement(value, this.bindings.i18n);
     return {
       ...partialItem,
@@ -167,9 +167,9 @@ export class AtomicSearchBoxRecentQueries {
       ),
 
       onSelect: () => {
-        if (this.bindings.isStandalone) {
-          this.bindings.searchBoxController.updateText(value);
-          this.bindings.searchBoxController.submit();
+        if (this.bindings.isStandalone()) {
+          this.bindings.searchBoxController().updateText(value);
+          this.bindings.searchBoxController().submit();
           return;
         }
 
diff --git a/packages/atomic/src/components/search/tabs/atomic-tab-manager/atomic-tab-manager.new.stories.tsx b/packages/atomic/src/components/search/tabs/atomic-tab-manager/atomic-tab-manager.new.stories.tsx
index fbf50ae3ef6..c0b4c1a382f 100644
--- a/packages/atomic/src/components/search/tabs/atomic-tab-manager/atomic-tab-manager.new.stories.tsx
+++ b/packages/atomic/src/components/search/tabs/atomic-tab-manager/atomic-tab-manager.new.stories.tsx
@@ -61,176 +61,126 @@ export const Default: Story = {
   name: 'atomic-tab-manager',
   decorators: [
     (story) => html`
-      ${story()}
-      <atomic-refine-toggle></atomic-refine-toggle>
-      <div style="padding:10px;">
-        <atomic-sort-dropdown>
-          <atomic-sort-expression
-            tabs-excluded='["article"]'
-            label="Name descending"
-            expression="name descending"
-          ></atomic-sort-expression>
-          <atomic-sort-expression
-            tabs-excluded='["article"]'
-            label="Name ascending"
-            expression="name ascending"
-          ></atomic-sort-expression>
-          <atomic-sort-expression
-            tabs-included='["article"]'
-            label="Most Recent"
-            expression="date descending"
-          ></atomic-sort-expression>
-          <atomic-sort-expression
-            tabs-included='["article"]'
-            label="Least Recent"
-            expression="date ascending"
-          ></atomic-sort-expression>
-          <atomic-sort-expression
-            label="relevance"
-            expression="relevancy"
-          ></atomic-sort-expression>
-        </atomic-sort-dropdown>
-      </div>
-      <div style="display: flex;">
-        <atomic-smart-snippet
-          tabs-included='["article", "documentation"]'
-          style="padding: 10px;"
-        ></atomic-smart-snippet>
-      </div>
-      <div style="display: flex; justify-content: flex-start;">
-        <atomic-facet field="objecttype" label="Object type"></atomic-facet>
-        <atomic-facet
-          aria-label="included-facet"
-          tabs-included='["article"]'
-          field="filetype"
-          label="File type"
-        ></atomic-facet>
-        <atomic-facet
-          aria-label="excluded-facet"
-          tabs-excluded='["article"]'
-          field="source"
-          label="Source"
-        ></atomic-facet>
-      </div>
-      <div style="display: flex; justify-content: flex-start;">
-        <atomic-category-facet
-          aria-label="included-facet"
-          tabs-included='["article"]'
-          field="geographicalhierarchy"
-          label="World Atlas"
-          with-search
-        ></atomic-category-facet>
-        <atomic-category-facet
-          aria-label="excluded-facet"
-          tabs-excluded='["article"]'
-          field="geographicalhierarchy"
-          label="World Atlas"
-        ></atomic-category-facet>
-        <atomic-color-facet
-          aria-label="included-facet"
-          tabs-included='["article"]'
-          field="filetype"
-          label="Files"
-          number-of-values="6"
-          sort-criteria="occurrences"
-        ></atomic-color-facet>
-        <atomic-color-facet
-          aria-label="excluded-facet"
-          tabs-excluded='["article"]'
-          field="filetype"
-          label="Files"
-          number-of-values="6"
-          sort-criteria="occurrences"
-        ></atomic-color-facet>
-      </div>
-      <div style="display: flex; justify-content: flex-start;">
-        <atomic-rating-facet
-          aria-label="included-facet"
-          tabs-included='["article"]'
-          field="snrating"
-          label="Rating"
-          number-of-intervals="5"
-        ></atomic-rating-facet>
-        <atomic-rating-facet
-          aria-label="excluded-facet"
-          tabs-excluded='["article"]'
-          field="snrating"
-          label="Rating"
-          number-of-intervals="5"
-        ></atomic-rating-facet>
-        <atomic-rating-range-facet
-          aria-label="included-facet"
-          tabs-included='["article"]'
-          facet-id="snrating_range"
-          field="snrating"
-          label="Rating Range (auto)"
-          number-of-intervals="5"
-        ></atomic-rating-range-facet>
-        <atomic-rating-range-facet
-          aria-label="excluded-facet"
-          tabs-excluded='["article"]'
-          facet-id="snrating_range_2"
-          field="snrating"
-          label="Rating Range (auto)"
-          number-of-intervals="5"
-        ></atomic-rating-range-facet>
-      </div>
-      <div style="display: flex; justify-content: flex-start; padding:50px;">
-        <atomic-segmented-facet-scrollable>
-          <atomic-segmented-facet
-            aria-label="included-facet"
-            tabs-included='["article"]'
-            field="inat_kingdom"
-            label="Kingdom"
-          ></atomic-segmented-facet>
-        </atomic-segmented-facet-scrollable>
-        <atomic-segmented-facet-scrollable>
-          <atomic-segmented-facet
-            aria-label="excluded-facet"
-            tabs-excluded='["article"]'
-            field="inat_kingdom"
-            label="Kingdom"
-          ></atomic-segmented-facet>
-        </atomic-segmented-facet-scrollable>
-      </div>
-      <div style="display: flex; justify-content: flex-start;">
-        <atomic-timeframe-facet
-          aria-label="included-facet"
-          tabs-included='["article"]'
-          label="Timeframe"
-          with-date-picker
-        >
-          <atomic-timeframe unit="hour"></atomic-timeframe>
-          <atomic-timeframe unit="day"></atomic-timeframe>
-          <atomic-timeframe unit="week"></atomic-timeframe>
-          <atomic-timeframe unit="month"></atomic-timeframe>
-          <atomic-timeframe unit="quarter"></atomic-timeframe>
-          <atomic-timeframe unit="year"></atomic-timeframe>
-          <atomic-timeframe
-            unit="year"
-            amount="10"
-            period="next"
-          ></atomic-timeframe
-        ></atomic-timeframe-facet>
-        <atomic-timeframe-facet
-          aria-label="excluded-facet"
-          tabs-excluded='["article"]'
-          label="Timeframe"
-          with-date-picker
-        >
-          <atomic-timeframe unit="hour"></atomic-timeframe>
-          <atomic-timeframe unit="day"></atomic-timeframe>
-          <atomic-timeframe unit="week"></atomic-timeframe>
-          <atomic-timeframe unit="month"></atomic-timeframe>
-          <atomic-timeframe unit="quarter"></atomic-timeframe>
-          <atomic-timeframe unit="year"></atomic-timeframe>
-          <atomic-timeframe
-            unit="year"
-            amount="10"
-            period="next"
-          ></atomic-timeframe
-        ></atomic-timeframe-facet>
-      </div>
+      <atomic-search-layout>
+        <atomic-layout-section section="search">
+          <atomic-search-box></atomic-search-box>
+        </atomic-layout-section>
+        <atomic-layout-section section="facets">
+          <atomic-facets>
+            <atomic-facet field="objecttype" label="Object type"></atomic-facet>
+            <atomic-facet aria-label="included-facet" tabs-included='["article"]' field="filetype"
+              label="File type (included facet)"></atomic-facet>
+            <atomic-facet aria-label="excluded-facet" tabs-excluded='["article"]' field="source"
+              label="Source (excluded facet)"></atomic-facet>
+            <atomic-category-facet aria-label="included-facet" tabs-included='["article"]' field="geographicalhierarchy"
+              label="World Atlas" with-search></atomic-category-facet>
+            <atomic-category-facet aria-label="excluded-facet" tabs-excluded='["article"]' field="geographicalhierarchy"
+              label="World Atlas"></atomic-category-facet>
+            <atomic-color-facet aria-label="included-facet" tabs-included='["article"]' field="filetype" label="Files"
+              number-of-values="6" sort-criteria="occurrences"></atomic-color-facet>
+            <atomic-color-facet aria-label="excluded-facet" tabs-excluded='["article"]' field="filetype" label="Files"
+              number-of-values="6" sort-criteria="occurrences"></atomic-color-facet>
+            <atomic-rating-facet aria-label="included-facet" tabs-included='["article"]' field="snrating" label="Rating"
+              number-of-intervals="5"></atomic-rating-facet>
+            <atomic-rating-facet aria-label="excluded-facet" tabs-excluded='["article"]' field="snrating" label="Rating"
+              number-of-intervals="5"></atomic-rating-facet>
+            <atomic-rating-range-facet aria-label="included-facet" tabs-included='["article"]' facet-id="snrating_range"
+              field="snrating" label="Rating Range (auto)" number-of-intervals="5"></atomic-rating-range-facet>
+            <atomic-rating-range-facet aria-label="excluded-facet" tabs-excluded='["article"]'
+              facet-id="snrating_range_2" field="snrating" label="Rating Range (auto)"
+              number-of-intervals="5"></atomic-rating-range-facet>
+            <atomic-timeframe-facet aria-label="included-facet" tabs-included='["article"]' label="Timeframe"
+              with-date-picker>
+              <atomic-timeframe unit="hour"></atomic-timeframe>
+              <atomic-timeframe unit="day"></atomic-timeframe>
+              <atomic-timeframe unit="week"></atomic-timeframe>
+              <atomic-timeframe unit="month"></atomic-timeframe>
+              <atomic-timeframe unit="quarter"></atomic-timeframe>
+              <atomic-timeframe unit="year"></atomic-timeframe>
+              <atomic-timeframe unit="year" amount="10" period="next"></atomic-timeframe></atomic-timeframe-facet>
+            <atomic-timeframe-facet aria-label="excluded-facet" tabs-excluded='["article"]' label="Timeframe"
+              with-date-picker>
+              <atomic-timeframe unit="hour"></atomic-timeframe>
+              <atomic-timeframe unit="day"></atomic-timeframe>
+              <atomic-timeframe unit="week"></atomic-timeframe>
+              <atomic-timeframe unit="month"></atomic-timeframe>
+              <atomic-timeframe unit="quarter"></atomic-timeframe>
+              <atomic-timeframe unit="year"></atomic-timeframe>
+              <atomic-timeframe unit="year" amount="10" period="next"></atomic-timeframe></atomic-timeframe-facet>
+          </atomic-facets>
+        </atomic-layout-section>
+        <atomic-layout-section section="main">
+          ${story()}
+          <atomic-layout-section section="horizontal-facets">
+            <atomic-segmented-facet-scrollable>
+              <atomic-segmented-facet aria-label="included-facet" tabs-included='["article"]' field="inat_kingdom"
+                label="Kingdom"></atomic-segmented-facet>
+            </atomic-segmented-facet-scrollable>
+            <atomic-segmented-facet-scrollable>
+              <atomic-segmented-facet aria-label="excluded-facet" tabs-excluded='["article"]' field="inat_kingdom"
+                label="Kingdom"></atomic-segmented-facet>
+            </atomic-segmented-facet-scrollable>
+          </atomic-layout-section>
+          <atomic-layout-section section="status">
+            <atomic-breadbox></atomic-breadbox>
+            <atomic-query-summary></atomic-query-summary>
+            <atomic-refine-toggle></atomic-refine-toggle>
+            <atomic-sort-dropdown>
+              <atomic-sort-expression tabs-excluded='["article"]' label="Name descending"
+                expression="name descending"></atomic-sort-expression>
+              <atomic-sort-expression tabs-excluded='["article"]' label="Name ascending"
+                expression="name ascending"></atomic-sort-expression>
+              <atomic-sort-expression tabs-included='["article"]' label="Most Recent"
+                expression="date descending"></atomic-sort-expression>
+              <atomic-sort-expression tabs-included='["article"]' label="Least Recent"
+                expression="date ascending"></atomic-sort-expression>
+              <atomic-sort-expression label="relevance" expression="relevancy"></atomic-sort-expression>
+            </atomic-sort-dropdown>
+          </atomic-layout-section>
+          <atomic-layout-section section="results">
+            <atomic-smart-snippet tabs-included='["article", "documentation"]'
+              style="padding: 10px;"></atomic-smart-snippet>
+            <atomic-result-list tabs-included='["article"]' display="list" density="compact" image-size="small"
+              data-testid="included-result-list">
+              <atomic-result-template>
+
+                <template>
+
+                  <atomic-result-section-actions><atomic-quickview></atomic-quickview></atomic-result-section-actions>
+                  <atomic-result-section-visual>
+
+                    <img src="https://picsum.photos/350" class="thumbnail" />
+                  </atomic-result-section-visual>
+                  <atomic-result-section-title><atomic-result-link></atomic-result-link></atomic-result-section-title>
+                  <atomic-result-section-excerpt>
+                    "included result list"
+                    <atomic-result-text field="excerpt"></atomic-result-text></atomic-result-section-excerpt>
+                </template>
+              </atomic-result-template>
+            </atomic-result-list>
+            <atomic-result-list tabs-excluded='["article"]' display="grid" density="normal" image-size="icon"
+              data-testid="excluded-result-list">
+
+              <atomic-result-template>
+                <template>
+
+                  <atomic-result-section-actions><atomic-quickview></atomic-quickview></atomic-result-section-actions>
+                  <atomic-result-section-visual>
+
+                    <img src="https://picsum.photos/400" class="thumbnail" />
+                  </atomic-result-section-visual>
+                  <atomic-result-section-title><atomic-result-link></atomic-result-link></atomic-result-section-title>
+                  <atomic-result-section-excerpt>
+                    "excluded result list"
+                    <atomic-result-text field="excerpt"></atomic-result-text></atomic-result-section-excerpt>
+                </template>
+              </atomic-result-template>
+            </atomic-result-list>
+            <atomic-query-error></atomic-commerce-query-error>
+          </atomic-layout-section>
+          <atomic-layout-section section="pagination"></atomic-layout-section>
+        </atomic-layout-section>
+      </atomic-search-layout>
     `,
   ],
 };
diff --git a/packages/atomic/src/components/search/tabs/atomic-tab-manager/e2e/atomic-tab-manager.e2e.ts b/packages/atomic/src/components/search/tabs/atomic-tab-manager/e2e/atomic-tab-manager.e2e.ts
index e949b7f8760..6ba5dfc12f3 100644
--- a/packages/atomic/src/components/search/tabs/atomic-tab-manager/e2e/atomic-tab-manager.e2e.ts
+++ b/packages/atomic/src/components/search/tabs/atomic-tab-manager/e2e/atomic-tab-manager.e2e.ts
@@ -11,13 +11,13 @@ test.describe('AtomicTabManager', () => {
   });
 
   test('should not display tabs dropdown', async ({tabManager}) => {
-    await expect(tabManager.tabDropdown).not.toBeVisible();
+    await expect(tabManager.tabDropdown).toBeHidden();
   });
 
   test('should display tab buttons for each atomic-tab elements', async ({
     tabManager,
   }) => {
-    await expect(tabManager.tabDropdown).not.toBeVisible();
+    await expect(tabManager.tabDropdown).toBeHidden();
 
     await expect(tabManager.tabButtons()).toHaveText([
       'All',
@@ -37,7 +37,7 @@ test.describe('AtomicTabManager', () => {
     });
 
     test('should not display tabs dropdown', async ({tabManager}) => {
-      await expect(tabManager.tabDropdown).not.toBeVisible();
+      await expect(tabManager.tabDropdown).toBeHidden();
     });
 
     test.describe('should change other component visibility', async () => {
@@ -47,7 +47,7 @@ test.describe('AtomicTabManager', () => {
       test('facets', async ({tabManager}) => {
         const includedFacets = await tabManager.includedFacet.all();
         for (let i = 0; i < includedFacets.length; i++) {
-          await expect(includedFacets[i]).not.toBeVisible();
+          await expect(includedFacets[i]).toBeHidden();
         }
 
         const excludedFacets = await tabManager.excludedFacet.all();
@@ -57,7 +57,7 @@ test.describe('AtomicTabManager', () => {
       });
 
       test('smart snippet', async ({tabManager}) => {
-        await expect(tabManager.smartSnippet).not.toBeVisible();
+        await expect(tabManager.smartSnippet).toBeHidden();
       });
 
       test('sort dropdown', async ({tabManager}) => {
@@ -74,7 +74,7 @@ test.describe('AtomicTabManager', () => {
     test('should display tab buttons for each atomic-tab elements', async ({
       tabManager,
     }) => {
-      await expect(tabManager.tabDropdown).not.toBeVisible();
+      await expect(tabManager.tabDropdown).toBeHidden();
 
       await expect(tabManager.tabButtons()).toHaveText([
         'All',
@@ -102,7 +102,7 @@ test.describe('AtomicTabManager', () => {
 
           const excludedFacets = await tabManager.excludedFacet.all();
           for (let i = 0; i < excludedFacets.length; i++) {
-            await expect(excludedFacets[i]).not.toBeVisible();
+            await expect(excludedFacets[i]).toBeHidden();
           }
         });
 
@@ -136,19 +136,18 @@ test.describe('AtomicTabManager', () => {
 
             const includedFacets = await tabManager.includedFacet.all();
             for (let i = 0; i < includedFacets.length; i++) {
-              await expect(includedFacets[i]).not.toBeVisible();
+              await expect(includedFacets[i]).toBeHidden();
             }
           });
 
           test('smart snippet', async ({tabManager}) => {
-            await expect(tabManager.smartSnippet).not.toBeVisible();
+            await expect(tabManager.smartSnippet).toBeHidden();
           });
 
           test('sort dropdown', async ({tabManager}) => {
-            await tabManager.refineModalButton.click();
-            await tabManager.refineModalHeader.waitFor({state: 'visible'});
+            await tabManager.sortDropdown.waitFor({state: 'visible'});
 
-            await expect(tabManager.refineModalSortDropdownOptions).toHaveText([
+            await expect(tabManager.sortDropdownOptions).toHaveText([
               'Name descending',
               'Name ascending',
               'Relevance',
@@ -167,7 +166,7 @@ test.describe('AtomicTabManager', () => {
         });
 
         test('should hide tabs area', async ({tabManager}) => {
-          await expect(tabManager.tabArea).not.toBeVisible();
+          await expect(tabManager.tabArea).toBeHidden();
         });
 
         test('should have the active tab selected in the dropdown', async ({
@@ -190,7 +189,7 @@ test.describe('AtomicTabManager', () => {
     });
 
     test('should not display tabs area', async ({tabManager}) => {
-      await expect(tabManager.tabArea).not.toBeVisible();
+      await expect(tabManager.tabArea).toBeHidden();
     });
 
     test('should display tabs dropdown', async ({tabManager}) => {
@@ -208,9 +207,8 @@ test.describe('AtomicTabManager', () => {
     });
 
     test.describe('when selecting a dropdown option', () => {
-      test.beforeEach(async ({tabManager, facets}) => {
+      test.beforeEach(async ({tabManager}) => {
         await tabManager.tabDropdown.selectOption('article');
-        await facets.getFacetValue.first().waitFor({state: 'visible'});
       });
 
       test('should change active tab', async ({tabManager}) => {
@@ -219,19 +217,22 @@ test.describe('AtomicTabManager', () => {
 
       test.describe('should change other component visibility', async () => {
         test('facets', async ({tabManager}) => {
-          const includedFacets = await tabManager.includedFacet.all();
+          await tabManager.refineModalButton.click();
+          await tabManager.refineModalHeader.waitFor({state: 'visible'});
+
+          const includedFacets = await tabManager.includedModalFacet.all();
           for (let i = 0; i < includedFacets.length; i++) {
             await expect(includedFacets[i]).toBeVisible();
           }
 
-          const excludedFacets = await tabManager.excludedFacet.all();
+          const excludedFacets = await tabManager.excludedModalFacet.all();
           for (let i = 0; i < excludedFacets.length; i++) {
-            await expect(excludedFacets[i]).not.toBeVisible();
+            await expect(excludedFacets[i]).toBeHidden();
           }
         });
 
         test('smart snippet', async ({tabManager}) => {
-          await expect(tabManager.smartSnippet).toBeVisible();
+          await expect(tabManager.smartSnippet).not.toBeHidden();
         });
 
         test('sort dropdown', async ({tabManager}) => {
@@ -247,26 +248,28 @@ test.describe('AtomicTabManager', () => {
       });
 
       test.describe('when selecting previous dropdown option', () => {
-        test.beforeEach(async ({tabManager, facets}) => {
+        test.beforeEach(async ({tabManager}) => {
           await tabManager.tabDropdown.selectOption('all');
-          await facets.getFacetValue.first().waitFor({state: 'visible'});
         });
 
         test.describe('should change other component visibility', async () => {
           test('facets', async ({tabManager}) => {
-            const excludedFacets = await tabManager.excludedFacet.all();
+            await tabManager.refineModalButton.click();
+            await tabManager.refineModalHeader.waitFor({state: 'visible'});
+
+            const excludedFacets = await tabManager.excludedModalFacet.all();
             for (let i = 0; i < excludedFacets.length; i++) {
               await expect(excludedFacets[i]).toBeVisible();
             }
 
-            const includedFacets = await tabManager.includedFacet.all();
+            const includedFacets = await tabManager.includedModalFacet.all();
             for (let i = 0; i < includedFacets.length; i++) {
-              await expect(includedFacets[i]).not.toBeVisible();
+              await expect(includedFacets[i]).toBeHidden();
             }
           });
 
           test('smart snippet', async ({tabManager}) => {
-            await expect(tabManager.smartSnippet).not.toBeVisible();
+            await expect(tabManager.smartSnippet).toBeHidden();
           });
 
           test('sort dropdown', async ({tabManager}) => {
@@ -288,7 +291,7 @@ test.describe('AtomicTabManager', () => {
         });
 
         test('should hide tabs dropdown', async ({tabManager}) => {
-          await expect(tabManager.tabDropdown).not.toBeVisible();
+          await expect(tabManager.tabDropdown).toBeHidden();
         });
 
         test('should display tabs area', async ({tabManager}) => {
diff --git a/packages/atomic/src/components/search/tabs/atomic-tab-manager/e2e/page-object.ts b/packages/atomic/src/components/search/tabs/atomic-tab-manager/e2e/page-object.ts
index 2d68f309c71..e7e33fa1455 100644
--- a/packages/atomic/src/components/search/tabs/atomic-tab-manager/e2e/page-object.ts
+++ b/packages/atomic/src/components/search/tabs/atomic-tab-manager/e2e/page-object.ts
@@ -25,9 +25,20 @@ export class TabManagerPageObject extends BasePageObject<'atomic-tab-manager'> {
   get includedFacet() {
     return this.page.getByLabel(/^included-facet$/);
   }
+  get excludedModalFacet() {
+    return this.page
+      .locator('atomic-refine-modal')
+      .getByLabel(/^excluded-facet$/);
+  }
+
+  get includedModalFacet() {
+    return this.page
+      .locator('atomic-refine-modal')
+      .getByLabel(/^included-facet$/);
+  }
 
   get smartSnippet() {
-    return this.page.locator('atomic-smart-snippet [part="smart-snippet"]');
+    return this.page.getByText('Creating an In-Product Experience (IPX)');
   }
 
   get sortDropdown() {
diff --git a/packages/atomic/storybookUtils/search/search-interface-wrapper.tsx b/packages/atomic/storybookUtils/search/search-interface-wrapper.tsx
index 6f3f2f665b5..f1b742f1d6e 100644
--- a/packages/atomic/storybookUtils/search/search-interface-wrapper.tsx
+++ b/packages/atomic/storybookUtils/search/search-interface-wrapper.tsx
@@ -40,3 +40,17 @@ export const wrapInSearchInterface = (
     });
   },
 });
+
+export const playExecuteFirstSearch: (
+  context: StoryContext
+) => Promise<void> = async ({canvasElement, step}) => {
+  const canvas = within(canvasElement);
+
+  const searchInterface =
+    await canvas.findByTestId<HTMLAtomicSearchInterfaceElement>(
+      'root-interface'
+    );
+  await step('Execute the first search', async () => {
+    await searchInterface!.executeFirstSearch();
+  });
+};
diff --git a/packages/headless/src/app/engine-configuration.ts b/packages/headless/src/app/engine-configuration.ts
index b7f204f7d5b..6f026d34507 100644
--- a/packages/headless/src/app/engine-configuration.ts
+++ b/packages/headless/src/app/engine-configuration.ts
@@ -157,13 +157,15 @@ export interface AnalyticsConfiguration {
   documentLocation?: string;
   /**
    * The unique identifier of the tracking target.
-   * @internal
    */
   trackingId?: string;
   /**
-   * Specifies the analytics mode to use.
-   * By default, `legacy`.
-   * @internal
+   * The analytics client to use.
+   * - `legacy`: The legacy analytics client, i.e., the Coveo Analytics.js library.
+   * - `next`: The next analytics client, i.e., the Coveo Event Protocol with the Relay library.
+   *
+   * Starting at V3.0, the default value will be `next`.
+   * @default 'legacy'
    */
   analyticsMode?: 'legacy' | 'next';
   /**
diff --git a/packages/headless/src/controllers/commerce/standalone-search-box/headless-standalone-search-box-options.ts b/packages/headless/src/controllers/commerce/standalone-search-box/headless-standalone-search-box-options.ts
index ef9e0e273fb..894393f1ad8 100644
--- a/packages/headless/src/controllers/commerce/standalone-search-box/headless-standalone-search-box-options.ts
+++ b/packages/headless/src/controllers/commerce/standalone-search-box/headless-standalone-search-box-options.ts
@@ -1,4 +1,4 @@
-import {Schema, StringValue} from '@coveo/bueno';
+import {BooleanValue, Schema, StringValue} from '@coveo/bueno';
 import {
   searchBoxOptionDefinitions,
   SearchBoxOptions,
@@ -10,6 +10,10 @@ export interface StandaloneSearchBoxOptions extends SearchBoxOptions {
    * If a query pipeline redirect is triggered, it will redirect to that Url instead.
    */
   redirectionUrl: string;
+  /**
+   * Whether to overwrite the existing standalone search box with the same id.
+   */
+  overwrite?: boolean;
 }
 
 export const standaloneSearchBoxSchema = new Schema<
@@ -20,4 +24,7 @@ export const standaloneSearchBoxSchema = new Schema<
     required: true,
     emptyAllowed: false,
   }),
+  overwrite: new BooleanValue({
+    required: false,
+  }),
 });
diff --git a/packages/headless/src/controllers/commerce/standalone-search-box/headless-standalone-search-box.test.ts b/packages/headless/src/controllers/commerce/standalone-search-box/headless-standalone-search-box.test.ts
index 4963566d806..5f73b128e94 100644
--- a/packages/headless/src/controllers/commerce/standalone-search-box/headless-standalone-search-box.test.ts
+++ b/packages/headless/src/controllers/commerce/standalone-search-box/headless-standalone-search-box.test.ts
@@ -80,6 +80,7 @@ describe('headless standalone searchBox', () => {
     expect(registerStandaloneSearchBox).toHaveBeenCalledWith({
       id,
       redirectionUrl: options.redirectionUrl,
+      overwrite: false,
     });
   });
 
diff --git a/packages/headless/src/controllers/commerce/standalone-search-box/headless-standalone-search-box.ts b/packages/headless/src/controllers/commerce/standalone-search-box/headless-standalone-search-box.ts
index 21fd06b80fd..ece51239576 100644
--- a/packages/headless/src/controllers/commerce/standalone-search-box/headless-standalone-search-box.ts
+++ b/packages/headless/src/controllers/commerce/standalone-search-box/headless-standalone-search-box.ts
@@ -8,6 +8,7 @@ import {
   fetchRedirectUrl,
   registerStandaloneSearchBox,
   resetStandaloneSearchBox,
+  updateStandaloneSearchBoxRedirectionUrl,
 } from '../../../features/commerce/standalone-search-box-set/standalone-search-box-set-actions';
 import {commerceStandaloneSearchBoxSetReducer as commerceStandaloneSearchBoxSet} from '../../../features/commerce/standalone-search-box-set/standalone-search-box-set-slice';
 import {querySuggestReducer as querySuggest} from '../../../features/query-suggest/query-suggest-slice';
@@ -37,6 +38,11 @@ export interface StandaloneSearchBox extends SearchBox {
    * Triggers a redirection.
    */
   submit(): void;
+  /**
+   * Updates the redirection url of the standalone search box.
+   * @param url - The new URL to redirect to.
+   */
+  updateRedirectUrl(url: string): void;
   /**
    * Resets the standalone search box state. To be dispatched on single page applications after the redirection has been triggered.
    */
@@ -77,6 +83,7 @@ export function buildStandaloneSearchBox(
     id,
     highlightOptions: {...props.options.highlightOptions},
     ...defaultSearchBoxOptions,
+    ...{overwrite: false},
     ...props.options,
   };
 
@@ -89,7 +96,11 @@ export function buildStandaloneSearchBox(
 
   const searchBox = buildSearchBox(engine, {options});
   dispatch(
-    registerStandaloneSearchBox({id, redirectionUrl: options.redirectionUrl})
+    registerStandaloneSearchBox({
+      id,
+      redirectionUrl: options.redirectionUrl,
+      overwrite: options.overwrite,
+    })
   );
 
   return {
@@ -109,6 +120,12 @@ export function buildStandaloneSearchBox(
       dispatch(resetStandaloneSearchBox({id}));
     },
 
+    updateRedirectUrl(url: string) {
+      dispatch(
+        updateStandaloneSearchBoxRedirectionUrl({id, redirectionUrl: url})
+      );
+    },
+
     submit() {
       dispatch(
         updateQuery({
diff --git a/packages/headless/src/controllers/core/generated-answer/headless-searchapi-generated-answer.test.ts b/packages/headless/src/controllers/core/generated-answer/headless-searchapi-generated-answer.test.ts
index 0b9bad9340d..c5e374207d5 100644
--- a/packages/headless/src/controllers/core/generated-answer/headless-searchapi-generated-answer.test.ts
+++ b/packages/headless/src/controllers/core/generated-answer/headless-searchapi-generated-answer.test.ts
@@ -36,10 +36,6 @@ jest.mock(
 jest.mock('../../../features/search/search-actions');
 
 describe('searchapi-generated-answer', () => {
-  it('should be tested', () => {
-    expect(true).toBe(true);
-  });
-
   let engine: MockedSearchEngine;
 
   const createGeneratedAnswer = (props: GeneratedAnswerProps = {}) =>
@@ -290,4 +286,25 @@ describe('searchapi-generated-answer', () => {
       exampleFieldsToIncludeInCitations
     );
   });
+
+  describe('when used with a preloaded state', () => {
+    beforeEach(() => {
+      const state = createMockState({
+        generatedAnswer: {
+          ...getGeneratedAnswerInitialState(),
+          id: 'some-id',
+        },
+      });
+      state.search.requestId = 'some-request-id';
+      state.search.extendedResults.generativeQuestionAnsweringId =
+        'some-stream-id';
+      engine = buildMockSearchEngine(state);
+    });
+
+    it('should not trigger any actions on initialization', () => {
+      engine.dispatch.mockClear();
+      createGeneratedAnswer();
+      expect(engine.dispatch).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/packages/headless/src/controllers/core/generated-answer/headless-searchapi-generated-answer.ts b/packages/headless/src/controllers/core/generated-answer/headless-searchapi-generated-answer.ts
index 29dc37aabad..6de5c23049c 100644
--- a/packages/headless/src/controllers/core/generated-answer/headless-searchapi-generated-answer.ts
+++ b/packages/headless/src/controllers/core/generated-answer/headless-searchapi-generated-answer.ts
@@ -127,10 +127,25 @@ export function buildSearchAPIGeneratedAnswer(
   const controller = buildCoreGeneratedAnswer(engine, analyticsClient, props);
   const getState = () => engine.state;
 
+  if (
+    engine.state.generatedAnswer.id &&
+    !subscribeStateManager.engines[engine.state.generatedAnswer.id]
+  ) {
+    subscribeStateManager.engines[engine.state.generatedAnswer.id] = {
+      abortController: undefined,
+      lastRequestId: engine.state.search.requestId,
+      lastStreamId:
+        engine.state.search.extendedResults.generativeQuestionAnsweringId ?? '',
+    };
+  }
+
   if (!engine.state.generatedAnswer.id) {
     const genQaEngineId = randomID('genQA-', 12);
     engine.dispatch(setId({id: genQaEngineId}));
-    subscribeStateManager.engines[genQaEngineId] = {
+  }
+
+  if (!subscribeStateManager.engines[engine.state.generatedAnswer.id]) {
+    subscribeStateManager.engines[engine.state.generatedAnswer.id] = {
       abortController: undefined,
       lastRequestId: '',
       lastStreamId: '',
diff --git a/packages/headless/src/controllers/standalone-search-box/headless-standalone-search-box-options.ts b/packages/headless/src/controllers/standalone-search-box/headless-standalone-search-box-options.ts
index a2712467146..4f1bd602a76 100644
--- a/packages/headless/src/controllers/standalone-search-box/headless-standalone-search-box-options.ts
+++ b/packages/headless/src/controllers/standalone-search-box/headless-standalone-search-box-options.ts
@@ -1,4 +1,4 @@
-import {Schema, StringValue} from '@coveo/bueno';
+import {BooleanValue, Schema, StringValue} from '@coveo/bueno';
 import {
   searchBoxOptionDefinitions,
   SearchBoxOptions,
@@ -10,6 +10,10 @@ export interface StandaloneSearchBoxOptions extends SearchBoxOptions {
    * If a query pipeline redirect is triggered, it will redirect to that Url instead.
    */
   redirectionUrl: string;
+  /**
+   * Whether to overwrite the existing standalone search box with the same id.
+   */
+  overwrite?: boolean;
 }
 
 export const standaloneSearchBoxSchema = new Schema<
@@ -20,4 +24,7 @@ export const standaloneSearchBoxSchema = new Schema<
     required: true,
     emptyAllowed: false,
   }),
+  overwrite: new BooleanValue({
+    required: false,
+  }),
 });
diff --git a/packages/headless/src/controllers/standalone-search-box/headless-standalone-search-box.test.ts b/packages/headless/src/controllers/standalone-search-box/headless-standalone-search-box.test.ts
index d469513df34..e436dace5d1 100644
--- a/packages/headless/src/controllers/standalone-search-box/headless-standalone-search-box.test.ts
+++ b/packages/headless/src/controllers/standalone-search-box/headless-standalone-search-box.test.ts
@@ -81,6 +81,7 @@ describe('headless standalone searchBox', () => {
     expect(registerStandaloneSearchBox).toHaveBeenCalledWith({
       id,
       redirectionUrl: options.redirectionUrl,
+      overwrite: false,
     });
   });
 
diff --git a/packages/headless/src/controllers/standalone-search-box/headless-standalone-search-box.ts b/packages/headless/src/controllers/standalone-search-box/headless-standalone-search-box.ts
index c5163df2023..db60fddcf56 100644
--- a/packages/headless/src/controllers/standalone-search-box/headless-standalone-search-box.ts
+++ b/packages/headless/src/controllers/standalone-search-box/headless-standalone-search-box.ts
@@ -11,6 +11,7 @@ import {
   updateAnalyticsToOmniboxFromLink,
   updateAnalyticsToSearchFromLink,
   resetStandaloneSearchBox,
+  updateStandaloneSearchBoxRedirectionUrl,
 } from '../../features/standalone-search-box-set/standalone-search-box-set-actions';
 import {standaloneSearchBoxSetReducer as standaloneSearchBoxSet} from '../../features/standalone-search-box-set/standalone-search-box-set-slice';
 import {StandaloneSearchBoxAnalytics} from '../../features/standalone-search-box-set/standalone-search-box-set-state';
@@ -50,6 +51,12 @@ export interface StandaloneSearchBox extends SearchBox {
    */
   submit(): void;
 
+  /**
+   * Updates the redirection url of the standalone search box.
+   * @param url - The new URL to redirect to.
+   */
+  updateRedirectUrl(url: string): void;
+
   /**
    * Resets the standalone search box state. To be dispatched on single page applications after the redirection has been triggered.
    */
@@ -96,6 +103,7 @@ export function buildStandaloneSearchBox(
     id,
     highlightOptions: {...props.options.highlightOptions},
     ...defaultSearchBoxOptions,
+    ...{overwrite: false},
     ...props.options,
   };
 
@@ -108,7 +116,11 @@ export function buildStandaloneSearchBox(
 
   const searchBox = buildSearchBox(engine, {options});
   dispatch(
-    registerStandaloneSearchBox({id, redirectionUrl: options.redirectionUrl})
+    registerStandaloneSearchBox({
+      id,
+      redirectionUrl: options.redirectionUrl,
+      overwrite: options.overwrite,
+    })
   );
 
   return {
@@ -135,6 +147,12 @@ export function buildStandaloneSearchBox(
       dispatch(resetStandaloneSearchBox({id}));
     },
 
+    updateRedirectUrl(url: string) {
+      dispatch(
+        updateStandaloneSearchBoxRedirectionUrl({id, redirectionUrl: url})
+      );
+    },
+
     submit() {
       dispatch(
         updateQuery({
diff --git a/packages/headless/src/features/commerce/standalone-search-box-set/standalone-search-box-set-actions-loader.ts b/packages/headless/src/features/commerce/standalone-search-box-set/standalone-search-box-set-actions-loader.ts
index ef6790342af..11ec0bd362e 100644
--- a/packages/headless/src/features/commerce/standalone-search-box-set/standalone-search-box-set-actions-loader.ts
+++ b/packages/headless/src/features/commerce/standalone-search-box-set/standalone-search-box-set-actions-loader.ts
@@ -10,6 +10,7 @@ import {
   fetchRedirectUrl,
   registerStandaloneSearchBox,
   resetStandaloneSearchBox,
+  updateStandaloneSearchBoxRedirectionUrl,
 } from './standalone-search-box-set-actions';
 
 export type {
@@ -55,6 +56,15 @@ export interface StandaloneSearchBoxSetActionCreators {
   resetStandaloneSearchBox(
     payload: ResetStandaloneSearchBoxPayload
   ): PayloadAction<ResetStandaloneSearchBoxPayload>;
+
+  /**
+   * Updates the redirection URL of the standalone search box.
+   * @param payload - The action creator payload.
+   * @returns A dispatchable action.
+   */
+  updateStandaloneSearchBoxRedirectionUrl(
+    payload: RegisterStandaloneSearchBoxPayload
+  ): PayloadAction<RegisterStandaloneSearchBoxPayload>;
 }
 
 /**
@@ -70,6 +80,7 @@ export function loadStandaloneSearchBoxSetActions(
   return {
     fetchRedirectUrl,
     registerStandaloneSearchBox,
+    updateStandaloneSearchBoxRedirectionUrl,
     resetStandaloneSearchBox,
   };
 }
diff --git a/packages/headless/src/features/commerce/standalone-search-box-set/standalone-search-box-set-actions.ts b/packages/headless/src/features/commerce/standalone-search-box-set/standalone-search-box-set-actions.ts
index 0571dec40bf..f5956ecd4ff 100644
--- a/packages/headless/src/features/commerce/standalone-search-box-set/standalone-search-box-set-actions.ts
+++ b/packages/headless/src/features/commerce/standalone-search-box-set/standalone-search-box-set-actions.ts
@@ -1,4 +1,4 @@
-import {StringValue} from '@coveo/bueno';
+import {BooleanValue, StringValue} from '@coveo/bueno';
 import {createAction, createAsyncThunk} from '@reduxjs/toolkit';
 import {
   AsyncThunkCommerceOptions,
@@ -67,11 +67,38 @@ export interface RegisterStandaloneSearchBoxPayload {
    * The default URL to which to redirect the user.
    */
   redirectionUrl: string;
+
+  /**
+   * Whether to overwrite the existing standalone search box with the same id.
+   */
+  overwrite?: boolean;
+}
+
+export interface UpdateStandaloneSearchBoxPayload {
+  /**
+   * The standalone search box id.
+   */
+  id: string;
+
+  /**
+   * The default URL to which to redirect the user.
+   */
+  redirectionUrl: string;
 }
 
 export const registerStandaloneSearchBox = createAction(
   'commerce/standaloneSearchBox/register',
   (payload: RegisterStandaloneSearchBoxPayload) =>
+    validatePayload(payload, {
+      id: requiredNonEmptyString,
+      redirectionUrl: requiredNonEmptyString,
+      overwrite: new BooleanValue({required: false}),
+    })
+);
+
+export const updateStandaloneSearchBoxRedirectionUrl = createAction(
+  'commerce/standaloneSearchBox/updateRedirectionUrl',
+  (payload: UpdateStandaloneSearchBoxPayload) =>
     validatePayload(payload, {
       id: requiredNonEmptyString,
       redirectionUrl: requiredNonEmptyString,
diff --git a/packages/headless/src/features/commerce/standalone-search-box-set/standalone-search-box-set-slice.test.ts b/packages/headless/src/features/commerce/standalone-search-box-set/standalone-search-box-set-slice.test.ts
index 918e3b3601a..1acd2f2d33d 100644
--- a/packages/headless/src/features/commerce/standalone-search-box-set/standalone-search-box-set-slice.test.ts
+++ b/packages/headless/src/features/commerce/standalone-search-box-set/standalone-search-box-set-slice.test.ts
@@ -3,6 +3,7 @@ import {
   fetchRedirectUrl,
   registerStandaloneSearchBox,
   resetStandaloneSearchBox,
+  updateStandaloneSearchBoxRedirectionUrl,
 } from './standalone-search-box-set-actions';
 import {commerceStandaloneSearchBoxSetReducer} from './standalone-search-box-set-slice';
 import {CommerceStandaloneSearchBoxSetState} from './standalone-search-box-set-state';
@@ -44,6 +45,43 @@ describe('commerce standalone search box slice', () => {
 
       expect(state[id]).toEqual(finalState[id]);
     });
+
+    it('when the id exists and the overwrite option is true, it registers the payload', () => {
+      const action = registerStandaloneSearchBox({
+        id,
+        redirectionUrl: 'url',
+        overwrite: true,
+      });
+      const finalState = commerceStandaloneSearchBoxSetReducer(state, action);
+
+      expect(finalState[id]).toEqual(
+        buildMockCommerceStandaloneSearchBoxEntry({
+          defaultRedirectionUrl: 'url',
+        })
+      );
+    });
+  });
+
+  describe('#updateStandaloneSearchBoxRedirectionUrl', () => {
+    it('when the id exists, it sets the default redirection url', () => {
+      const action = updateStandaloneSearchBoxRedirectionUrl({
+        id,
+        redirectionUrl: '/newpage',
+      });
+      const finalState = commerceStandaloneSearchBoxSetReducer(state, action);
+
+      expect(finalState[id]!.defaultRedirectionUrl).toBe('/newpage');
+    });
+
+    it('when the id does not exist, it does not edit the state', () => {
+      const action = updateStandaloneSearchBoxRedirectionUrl({
+        id: 'invalid',
+        redirectionUrl: '/newpage',
+      });
+      const finalState = commerceStandaloneSearchBoxSetReducer(state, action);
+
+      expect(finalState).toBe(state);
+    });
   });
 
   describe('#resetStandaloneSearchBox', () => {
diff --git a/packages/headless/src/features/commerce/standalone-search-box-set/standalone-search-box-set-slice.ts b/packages/headless/src/features/commerce/standalone-search-box-set/standalone-search-box-set-slice.ts
index e52a95c23db..29a62d69f88 100644
--- a/packages/headless/src/features/commerce/standalone-search-box-set/standalone-search-box-set-slice.ts
+++ b/packages/headless/src/features/commerce/standalone-search-box-set/standalone-search-box-set-slice.ts
@@ -3,6 +3,7 @@ import {
   fetchRedirectUrl,
   registerStandaloneSearchBox,
   resetStandaloneSearchBox,
+  updateStandaloneSearchBoxRedirectionUrl,
 } from './standalone-search-box-set-actions';
 import {
   getCommerceStandaloneSearchBoxSetInitialState,
@@ -14,14 +15,24 @@ export const commerceStandaloneSearchBoxSetReducer = createReducer(
   (builder) =>
     builder
       .addCase(registerStandaloneSearchBox, (state, action) => {
-        const {id, redirectionUrl} = action.payload;
+        const {id, redirectionUrl, overwrite} = action.payload;
 
-        if (id in state) {
+        if (!overwrite && id in state) {
           return;
         }
 
         state[id] = buildStandaloneSearchBoxEntry(redirectionUrl);
       })
+      .addCase(updateStandaloneSearchBoxRedirectionUrl, (state, action) => {
+        const {id, redirectionUrl} = action.payload;
+        const searchBox = state[id];
+
+        if (!searchBox) {
+          return;
+        }
+
+        searchBox.defaultRedirectionUrl = redirectionUrl;
+      })
       .addCase(resetStandaloneSearchBox, (state, action) => {
         const {id} = action.payload;
         const searchBox = state[id];
diff --git a/packages/headless/src/features/configuration/configuration-actions.ts b/packages/headless/src/features/configuration/configuration-actions.ts
index 7b94cc88473..4845443b773 100644
--- a/packages/headless/src/features/configuration/configuration-actions.ts
+++ b/packages/headless/src/features/configuration/configuration-actions.ts
@@ -157,9 +157,12 @@ export interface UpdateAnalyticsConfigurationActionCreatorPayload {
    */
   trackingId?: string;
   /**
-   * Specifies the analytics mode to use.
-   * By default, `legacy`.
-   * @internal
+   * The analytics client to use.
+   * - `legacy`: The legacy analytics client, i.e., the Coveo Analytics.js library.
+   * - `next`: The next analytics client, i.e., the Coveo Event Protocol with the Relay library.
+   *
+   * Starting at V3.0, the default value will be `next`.
+   * @default 'legacy'
    */
   analyticsMode?: 'legacy' | 'next';
   /**
diff --git a/packages/headless/src/features/standalone-search-box-set/standalone-search-box-set-actions-loader.ts b/packages/headless/src/features/standalone-search-box-set/standalone-search-box-set-actions-loader.ts
index 144247669f5..c0aa83be778 100644
--- a/packages/headless/src/features/standalone-search-box-set/standalone-search-box-set-actions-loader.ts
+++ b/packages/headless/src/features/standalone-search-box-set/standalone-search-box-set-actions-loader.ts
@@ -14,6 +14,7 @@ import {
   StateNeededForRedirect,
   resetStandaloneSearchBox,
   ResetStandaloneSearchBoxActionCreatorPayload,
+  updateStandaloneSearchBoxRedirectionUrl,
 } from './standalone-search-box-set-actions';
 
 export type {
@@ -62,6 +63,15 @@ export interface StandaloneSearchBoxSetActionCreators {
     AsyncThunkSearchOptions<StateNeededForRedirect>
   >;
 
+  /**
+   * Updates the redirection URL of the standalone search box.
+   * @param payload - The action creator payload.
+   * @returns A dispatchable action.
+   */
+  updateStandaloneSearchBoxRedirectionUrl(
+    payload: RegisterStandaloneSearchBoxActionCreatorPayload
+  ): PayloadAction<RegisterStandaloneSearchBoxActionCreatorPayload>;
+
   /**
    * Updates the standalone search box analytics data to reflect a search submitted using the search box.
    *
@@ -97,6 +107,7 @@ export function loadStandaloneSearchBoxSetActions(
   return {
     registerStandaloneSearchBox,
     fetchRedirectUrl,
+    updateStandaloneSearchBoxRedirectionUrl,
     updateAnalyticsToSearchFromLink,
     updateAnalyticsToOmniboxFromLink,
     resetStandaloneSearchBox,
diff --git a/packages/headless/src/features/standalone-search-box-set/standalone-search-box-set-actions.ts b/packages/headless/src/features/standalone-search-box-set/standalone-search-box-set-actions.ts
index 38378e3ee14..3bf2951fbd0 100644
--- a/packages/headless/src/features/standalone-search-box-set/standalone-search-box-set-actions.ts
+++ b/packages/headless/src/features/standalone-search-box-set/standalone-search-box-set-actions.ts
@@ -1,4 +1,4 @@
-import {StringValue} from '@coveo/bueno';
+import {BooleanValue, StringValue} from '@coveo/bueno';
 import {createAction, createAsyncThunk} from '@reduxjs/toolkit';
 import {getVisitorID} from '../../api/analytics/coveo-analytics-utils';
 import {ExecutionPlan} from '../../api/search/plan/plan-endpoint';
@@ -34,11 +34,38 @@ export interface RegisterStandaloneSearchBoxActionCreatorPayload {
    * The default URL to which to redirect the user.
    */
   redirectionUrl: string;
+
+  /**
+   * Whether to overwrite the existing standalone search box with the same id.
+   */
+  overwrite?: boolean;
+}
+
+export interface UpdateStandaloneSearchBoxPayload {
+  /**
+   * The standalone search box id.
+   */
+  id: string;
+
+  /**
+   * The default URL to which to redirect the user.
+   */
+  redirectionUrl: string;
 }
 
 export const registerStandaloneSearchBox = createAction(
   'standaloneSearchBox/register',
   (payload: RegisterStandaloneSearchBoxActionCreatorPayload) =>
+    validatePayload(payload, {
+      id: requiredNonEmptyString,
+      redirectionUrl: requiredNonEmptyString,
+      overwrite: new BooleanValue({required: false}),
+    })
+);
+
+export const updateStandaloneSearchBoxRedirectionUrl = createAction(
+  'standaloneSearchBox/updateRedirectionUrl',
+  (payload: UpdateStandaloneSearchBoxPayload) =>
     validatePayload(payload, {
       id: requiredNonEmptyString,
       redirectionUrl: requiredNonEmptyString,
diff --git a/packages/headless/src/features/standalone-search-box-set/standalone-search-box-set-slice.test.ts b/packages/headless/src/features/standalone-search-box-set/standalone-search-box-set-slice.test.ts
index 8656a77a869..f673afa32ba 100644
--- a/packages/headless/src/features/standalone-search-box-set/standalone-search-box-set-slice.test.ts
+++ b/packages/headless/src/features/standalone-search-box-set/standalone-search-box-set-slice.test.ts
@@ -6,6 +6,7 @@ import {
   updateAnalyticsToOmniboxFromLink,
   updateAnalyticsToSearchFromLink,
   resetStandaloneSearchBox,
+  updateStandaloneSearchBoxRedirectionUrl,
 } from './standalone-search-box-set-actions';
 import {standaloneSearchBoxSetReducer} from './standalone-search-box-set-slice';
 import {StandaloneSearchBoxSetState} from './standalone-search-box-set-state';
@@ -45,6 +46,41 @@ describe('standalone search box slice', () => {
 
       expect(state[id]).toEqual(finalState[id]);
     });
+
+    it('when the id exists and the overwrite option is true, it registers the payload', () => {
+      const action = registerStandaloneSearchBox({
+        id,
+        redirectionUrl: 'url',
+        overwrite: true,
+      });
+      const finalState = standaloneSearchBoxSetReducer(state, action);
+
+      expect(finalState[id]).toEqual(
+        buildMockStandaloneSearchBoxEntry({defaultRedirectionUrl: 'url'})
+      );
+    });
+  });
+
+  describe('#updateStandaloneSearchBoxRedirectionUrl', () => {
+    it('when the id exists, it sets the default redirection url', () => {
+      const action = updateStandaloneSearchBoxRedirectionUrl({
+        id,
+        redirectionUrl: '/newpage',
+      });
+      const finalState = standaloneSearchBoxSetReducer(state, action);
+
+      expect(finalState[id]!.defaultRedirectionUrl).toBe('/newpage');
+    });
+
+    it('when the id does not exist, it does not edit the state', () => {
+      const action = updateStandaloneSearchBoxRedirectionUrl({
+        id: 'invalid',
+        redirectionUrl: '/newpage',
+      });
+      const finalState = standaloneSearchBoxSetReducer(state, action);
+
+      expect(finalState).toBe(state);
+    });
   });
 
   describe('#resetStandaloneSearchBox', () => {
diff --git a/packages/headless/src/features/standalone-search-box-set/standalone-search-box-set-slice.ts b/packages/headless/src/features/standalone-search-box-set/standalone-search-box-set-slice.ts
index be23c046f4b..9b05de9eeaa 100644
--- a/packages/headless/src/features/standalone-search-box-set/standalone-search-box-set-slice.ts
+++ b/packages/headless/src/features/standalone-search-box-set/standalone-search-box-set-slice.ts
@@ -5,6 +5,7 @@ import {
   resetStandaloneSearchBox,
   updateAnalyticsToOmniboxFromLink,
   updateAnalyticsToSearchFromLink,
+  updateStandaloneSearchBoxRedirectionUrl,
 } from './standalone-search-box-set-actions';
 import {
   getStandaloneSearchBoxSetInitialState,
@@ -16,9 +17,9 @@ export const standaloneSearchBoxSetReducer = createReducer(
   (builder) =>
     builder
       .addCase(registerStandaloneSearchBox, (state, action) => {
-        const {id, redirectionUrl} = action.payload;
+        const {id, redirectionUrl, overwrite} = action.payload;
 
-        if (id in state) {
+        if (!overwrite && id in state) {
           return;
         }
 
@@ -35,6 +36,15 @@ export const standaloneSearchBoxSetReducer = createReducer(
           return;
         }
       })
+      .addCase(updateStandaloneSearchBoxRedirectionUrl, (state, action) => {
+        const {id, redirectionUrl} = action.payload;
+
+        if (!(id in state)) {
+          return;
+        }
+
+        state[id] = buildStandaloneSearchBoxEntry(redirectionUrl);
+      })
       .addCase(fetchRedirectUrl.pending, (state, action) => {
         const searchBox = state[action.meta.arg.id];