diff --git a/package-lock.json b/package-lock.json
index b12ff526..b3e9acd6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
         "@empathyco/x-adapter": "^8.1.0-alpha.0",
         "@empathyco/x-adapter-platform": "^1.1.0-alpha.3",
         "@empathyco/x-archetype-utils": "^2.0.0-alpha.1",
-        "@empathyco/x-components": "^6.0.0-alpha.2",
+        "@empathyco/x-components": "^6.0.0-alpha.3",
         "@empathyco/x-deep-merge": "^2.0.3-alpha.1",
         "@empathyco/x-types": "^10.1.0-alpha.3",
         "@empathyco/x-utils": "^1.0.3-alpha.1",
@@ -1943,9 +1943,9 @@
       }
     },
     "node_modules/@empathyco/x-components": {
-      "version": "6.0.0-alpha.2",
-      "resolved": "https://registry.npmjs.org/@empathyco/x-components/-/x-components-6.0.0-alpha.2.tgz",
-      "integrity": "sha512-4cV5SaekLLettrdcGMcmIIl4s5CH4fKIhfrePvQfK12pvdTIsKBqqTMTZAvKum/d/9wp+VJ1Vb+kwStW+7cWnQ==",
+      "version": "6.0.0-alpha.3",
+      "resolved": "https://registry.npmjs.org/@empathyco/x-components/-/x-components-6.0.0-alpha.3.tgz",
+      "integrity": "sha512-HTklNFr5rarXX0XX1Q1Ai4F/CeP4T6nEJwjI6eN5n/V+FVMsDIGg02StTeiKFYxRM9DoDeWneybsdCRIRCm+Ig==",
       "dependencies": {
         "@empathyco/x-adapter": "^8.1.0-alpha.0",
         "@empathyco/x-adapter-platform": "^1.1.0-alpha.3",
diff --git a/package.json b/package.json
index 0e68b36a..6aa23d77 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "test": "npm run test:e2e:ci",
     "lint": "eslint src tests --ext .ts,.tsx,.vue",
     "lint:fix": "npm run lint -- --fix",
-    "install:local": "npm install file:../x/packages/x-components/empathyco-x-components-6.0.0-alpha.1.tgz --no-save",
+    "install:local": "npm install file:../x/packages/x-components/empathyco-x-components-6.0.0-alpha.3.tgz --no-save",
     "install:adapter-platform:local": "npm install file:../x/packages/x-adapter-platform/empathyco-x-adapter-platform-1.0.0-alpha.73.tgz --no-save",
     "install:types:local": "npm install file:../x/packages/x-types/empathyco-x-types-10.0.0-alpha.68.tgz",
     "install:utils:local": "npm install file:../x/packages/x-archetype-utils/empathyco-x-archetype-utils-0.1.0-alpha.20.tgz --no-save",
@@ -33,7 +33,7 @@
     "@empathyco/x-adapter": "^8.1.0-alpha.0",
     "@empathyco/x-adapter-platform": "^1.1.0-alpha.3",
     "@empathyco/x-archetype-utils": "^2.0.0-alpha.1",
-    "@empathyco/x-components": "^6.0.0-alpha.2",
+    "@empathyco/x-components": "^6.0.0-alpha.3",
     "@empathyco/x-deep-merge": "^2.0.3-alpha.1",
     "@empathyco/x-types": "^10.1.0-alpha.3",
     "@empathyco/x-utils": "^1.0.3-alpha.1",
diff --git a/src/components/mobile/mobile-sub-header.vue b/src/components/mobile/mobile-sub-header.vue
index ef2587c4..373a5033 100644
--- a/src/components/mobile/mobile-sub-header.vue
+++ b/src/components/mobile/mobile-sub-header.vue
@@ -4,7 +4,7 @@
       <LocationProvider location="predictive_layer">
         <RelatedTags v-if="hasSearched" class="x-pb-16" />
       </LocationProvider>
-      <div v-if="x.query.search">
+      <div v-if="hasSearched">
         <MobileToolbar class="x-mb-16" />
       </div>
     </div>
@@ -13,7 +13,7 @@
 
 <script lang="ts">
   import { defineAsyncComponent, defineComponent } from 'vue';
-  import { LocationProvider, use$x } from '@empathyco/x-components';
+  import { LocationProvider } from '@empathyco/x-components';
   import MobileToolbar from '../mobile/mobile-toolbar.vue';
   import CollapseHeightAnimation from '../collapse-height-animation.vue';
   // eslint-disable-next-line max-len
@@ -33,7 +33,7 @@
     },
     setup() {
       const { hasScrolledPastThreshold } = useHasScrollPastThreshold();
-      return { hasScrolledPastThreshold, x: use$x() };
+      return { hasScrolledPastThreshold };
     }
   });
 </script>
diff --git a/tests/e2e/cucumber/scroll.feature b/tests/e2e/cucumber/scroll.feature
index 4524378a..c049e21d 100644
--- a/tests/e2e/cucumber/scroll.feature
+++ b/tests/e2e/cucumber/scroll.feature
@@ -3,8 +3,6 @@ Feature: Scroll
   Background:
     Given a results API with known results
 
-  # TODO: Enable test after fixing it
-  @skip
   Scenario Outline: 1. Scroll position is kept in the URL and reset upon new search requests
     Given start page with "<view>" size view
     When  search bar is clicked
@@ -15,11 +13,9 @@ Feature: Scroll
     Then  url is updated with result "<resultId>"
     When  the page is reloaded
     And   result "<resultId>" is visible
-    Then  url is updated with result "<resultId>"
     When  scroll to top is clicked
     Then  result "result-0" is visible
     And   scroll position is at top
-    When  scrolling down to result "<resultId>"
     And   related tag number 0 is clicked
     Then  scroll position is at top
 
@@ -28,8 +24,6 @@ Feature: Scroll
       | tshirt | macbook-13  | result-12    |
       | tshirt | iphone-x    | result-12    |
 
-  # TODO: Enable test after fixing it
-  @skip
   Scenario Outline: 2. Scroll position is at end and toolbar is hidden
     Given start page with "<view>" size view
     When  search bar is clicked