diff --git a/components/core/CookieNotification.vue b/components/core/CookieNotification.vue
index 2716d39..68ad22f 100644
--- a/components/core/CookieNotification.vue
+++ b/components/core/CookieNotification.vue
@@ -57,14 +57,14 @@ export default {
       this.isOpen = false
     },
     setVisited () {
-      this.$store.dispatch('claims/set', {claimCode: 'cookiesAccepted', value: true})
+      this.$store.dispatch('claims/set', { claimCode: 'cookiesAccepted', value: true })
     }
   },
   mounted () {
-    this.$store.dispatch('claims/check', {claimCode: 'cookiesAccepted'}).then((cookieClaim) => {
+    this.$store.dispatch('claims/check', { claimCode: 'cookiesAccepted' }).then((cookieClaim) => {
       if (!cookieClaim) {
         this.isOpen = true
-        this.$store.dispatch('claims/set', {claimCode: 'cookiesAccepted', value: false})
+        this.$store.dispatch('claims/set', { claimCode: 'cookiesAccepted', value: false })
       } else {
         this.isOpen = !cookieClaim.value
       }
diff --git a/components/core/ProductBundleOption.vue b/components/core/ProductBundleOption.vue
index 51bd8f8..1cf85d7 100644
--- a/components/core/ProductBundleOption.vue
+++ b/components/core/ProductBundleOption.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="custom-option mb15">
     <h4> {{ option.title }} </h4>
-    <div class="m5 relative" v-for="opval in option.product_links" :key="opval.id">
+    <div class="m5 relative" v-for="opval in option.product_links" :key="opval.id" data-testid="bundle-single-option">
       <input
         type="radio"
         class="m0 no-outline"
diff --git a/components/core/ProductBundleOptions.vue b/components/core/ProductBundleOptions.vue
index d36f910..fc9b03a 100644
--- a/components/core/ProductBundleOptions.vue
+++ b/components/core/ProductBundleOptions.vue
@@ -1,5 +1,5 @@
 <template>
-  <form class="custom-options">
+  <form class="custom-options" data-testid="bundle-options">
     <div v-for="option in product.bundle_options" :key="('bundleOption_' + option.option_id)">
       <product-bundle-option :option="option" @option-changed="optionChanged" :error-messages="errorMessages" />
     </div>
diff --git a/components/core/ProductCustomOptions.vue b/components/core/ProductCustomOptions.vue
index a3ebba2..a6eea55 100644
--- a/components/core/ProductCustomOptions.vue
+++ b/components/core/ProductCustomOptions.vue
@@ -23,11 +23,11 @@
               type="radio"
               class="m0 no-outline"
               :name="('customOption_' + option.option_id)"
-              :id="('customOption_' + opval.option_type_id)"
+              :id="('customOption_' + option.option_id + '_' + opval.option_type_id)"
               focus
               :value="opval.option_type_id"
               v-model="inputValues[('customOption_' + option.option_id)]"
-            ><label class="pl10 lh20 h4 pointer" :for="('customOption_' + opval.option_type_id)" v-html="opval.title" />
+            ><label class="pl10 lh20 h4 pointer" :for="('customOption_' + option.option_id +'_' + opval.option_type_id)" v-html="opval.title" />
           </div>
         </div>
         <div v-if="option.type === 'checkbox'">
diff --git a/components/core/ProductGalleryCarousel.vue b/components/core/ProductGalleryCarousel.vue
index 6a11245..32bc715 100644
--- a/components/core/ProductGalleryCarousel.vue
+++ b/components/core/ProductGalleryCarousel.vue
@@ -11,6 +11,7 @@
       ref="carousel"
       :speed="carouselTransitionSpeed"
       @pageChange="pageChange"
+      :navigate-to="currentPage"
     >
       <slide
         v-for="(images, index) in gallery"
@@ -83,30 +84,29 @@ export default {
   },
   computed: {},
   beforeMount () {
-    this.$bus.$on('filter-changed-product', this.selectVariant)
+    this.$bus.$on('product-after-configure', this.selectVariant)
     this.$bus.$on('product-after-load', this.selectVariant)
   },
   mounted () {
     this.selectVariant()
 
     if (this.configuration.color) {
-      const {color} = this.configuration
+      const { color } = this.configuration
       this.currentColor = color.id
     }
 
     this.$emit('loaded')
   },
   beforeDestroy () {
-    this.$bus.$off('filter-changed-product', this.selectVariant)
+    this.$bus.$off('product-after-configure', this.selectVariant)
     this.$bus.$off('product-after-load', this.selectVariant)
   },
   methods: {
     navigate (index) {
-      if (this.$refs.carousel) {
-        this.$refs.carousel.goToPage(index)
-      }
+      this.currentPage = index
     },
-    selectVariant () {
+    async selectVariant (configuration) {
+      await this.$nextTick()
       if (config.products.gallery.mergeConfigurableChildren) {
         const option = reduce(map(this.configuration, 'attribute_code'), (result, attribute) => {
           result[attribute] = this.configuration[attribute].id
@@ -127,7 +127,7 @@ export default {
       this.$emit('toggle', currentSlide)
     },
     switchCarouselSpeed () {
-      const {color} = this.configuration
+      const { color } = this.configuration
       if (color && this.currentColor !== color.id) {
         this.currentColor = color.id
         this.carouselTransitionSpeed = 0
@@ -137,8 +137,6 @@ export default {
     },
     pageChange (index) {
       this.switchCarouselSpeed()
-
-      this.currentPage = index
       this.hideImageAtIndex = null
     },
     onVideoStarted (index) {
diff --git a/components/core/ProductGalleryImage.vue b/components/core/ProductGalleryImage.vue
index d3c1335..0f849c4 100644
--- a/components/core/ProductGalleryImage.vue
+++ b/components/core/ProductGalleryImage.vue
@@ -104,11 +104,11 @@ export default {
       return this.highQualityImage
     },
     imageRatio () {
-      const {width, height} = this.$store.state.config.products.gallery
+      const { width, height } = this.$store.state.config.products.gallery
       return `${height / (width / 100)}%`
     },
     style () {
-      return this.calcRatio ? {paddingBottom: this.imageRatio} : {}
+      return this.calcRatio ? { paddingBottom: this.imageRatio } : {}
     },
     isOnline (value) {
       return onlineHelper.isOnline
diff --git a/components/core/ProductGalleryZoomCarousel.vue b/components/core/ProductGalleryZoomCarousel.vue
index b2dc026..cdbdddb 100644
--- a/components/core/ProductGalleryZoomCarousel.vue
+++ b/components/core/ProductGalleryZoomCarousel.vue
@@ -23,6 +23,7 @@
           class="media-zoom-carousel__carousel"
           :speed="carouselTransitionSpeed"
           @pageChange="pageChange"
+          :navigate-to="currentPage"
         >
           <slide
             v-for="(images, index) in gallery"
@@ -104,18 +105,17 @@ export default {
       }
     }
   },
-  destroyed () {
+  beforeDestroy () {
     clearAllBodyScrollLocks()
   },
   methods: {
-    navigate (key) {
-      this.$refs.zoomCarousel.goToPage(key)
+    navigate (index) {
+      this.currentPage = index
     },
     increaseCarouselTransitionSpeed () {
       this.carouselTransitionSpeed = 500
     },
     pageChange (index) {
-      this.currentPage = index
       this.hideImageAtIndex = null
     },
     onVideoStarted (index) {
diff --git a/components/core/ProductImage.vue b/components/core/ProductImage.vue
index 21ebacf..6fd56e6 100644
--- a/components/core/ProductImage.vue
+++ b/components/core/ProductImage.vue
@@ -81,11 +81,11 @@ export default {
       return this.highQualityImage
     },
     imageRatio () {
-      const {width, height} = this.$store.state.config.products.gallery
+      const { width, height } = this.$store.state.config.products.gallery
       return `${height / (width / 100)}%`
     },
     style () {
-      return this.calcRatio ? {paddingBottom: this.imageRatio} : {}
+      return this.calcRatio ? { paddingBottom: this.imageRatio } : {}
     },
     isOnline (value) {
       return onlineHelper.isOnline
diff --git a/components/core/ProductPrice.vue b/components/core/ProductPrice.vue
index e9db8b7..8d55c73 100644
--- a/components/core/ProductPrice.vue
+++ b/components/core/ProductPrice.vue
@@ -48,7 +48,7 @@ export default {
     },
     customOptionsPriceDelta () {
       const priceDelta = getCustomOptionPriceDelta(
-        getCustomOptionValues(Object.values(this.customOptions), this.product.custom_options),
+        getCustomOptionValues(Object.values(this.customOptions), this.product.custom_options || []),
         this.product
       )
 
diff --git a/components/core/blocks/Auth/ForgotPass.vue b/components/core/blocks/Auth/ForgotPass.vue
index ec8b98f..43d6961 100644
--- a/components/core/blocks/Auth/ForgotPass.vue
+++ b/components/core/blocks/Auth/ForgotPass.vue
@@ -66,6 +66,7 @@
 import ButtonFull from 'theme/components/theme/ButtonFull.vue'
 import BaseInput from '../Form/BaseInput.vue'
 import { required, email } from 'vuelidate/lib/validators'
+import { Logger } from '@vue-storefront/core/lib/logger'
 import i18n from '@vue-storefront/i18n'
 
 export default {
@@ -105,7 +106,7 @@ export default {
           })
         }
       }).catch((err) => {
-        console.error(err)
+        Logger.error(err)()
         this.$bus.$emit('notification-progress-stop')
       })
     },
diff --git a/components/core/blocks/Auth/Register.vue b/components/core/blocks/Auth/Register.vue
index 26b7cf4..8af0708 100644
--- a/components/core/blocks/Auth/Register.vue
+++ b/components/core/blocks/Auth/Register.vue
@@ -50,6 +50,10 @@
               {
                 condition: !$v.firstName.minLength,
                 text: $t('Name must have at least 2 letters.')
+              },
+              {
+                condition: !$v.firstName.alpha && $v.firstName.$error,
+                text: $t('Accepts only alphabet characters.')
               }
             ]"
           />
@@ -61,10 +65,16 @@
             v-model="lastName"
             @blur="$v.lastName.$touch()"
             :placeholder="$t('Last name *')"
-            :validations="[{
-              condition: !$v.lastName.required && $v.lastName.$error,
-              text: $t('Field is required.')
-            }]"
+            :validations="[
+              {
+                condition: !$v.lastName.required && $v.lastName.$error,
+                text: $t('Field is required.')
+              },
+              {
+                condition: !$v.lastName.alpha && $v.lastName.$error,
+                text: $t('Accepts only alphabet characters.')
+              }
+            ]"
           />
         </div>
         <base-input
@@ -113,13 +123,13 @@
           @blur="$v.conditions.$reset()"
           @change="$v.conditions.$touch()"
           :validations="[{
-            condition: !$v.conditions.required && $v.conditions.$error,
+            condition: !$v.conditions.sameAs && $v.conditions.$error,
             text: $t('You must accept the terms and conditions.')
           }]"
         >
           {{ $t('I accept terms and conditions') }} *
         </base-checkbox>
-        <button-full class="mb20" type="submit">
+        <button-full :disabled="$v.$invalid" class="mb20" type="submit">
           {{ $t('Register an account') }}
         </button-full>
         <div class="center-xs">
@@ -139,7 +149,7 @@ import Register from '@vue-storefront/core/compatibility/components/blocks/Auth/
 import ButtonFull from 'theme/components/theme/ButtonFull.vue'
 import BaseCheckbox from 'theme/components/core/blocks/Form/BaseCheckbox.vue'
 import BaseInput from 'theme/components/core/blocks/Form/BaseInput.vue'
-import { required, email, minLength, sameAs } from 'vuelidate/lib/validators'
+import { required, email, minLength, sameAs, alpha } from 'vuelidate/lib/validators'
 
 export default {
   validations: {
@@ -149,10 +159,12 @@ export default {
     },
     firstName: {
       minLength: minLength(2),
-      required
+      required,
+      alpha
     },
     lastName: {
-      required
+      required,
+      alpha
     },
     password: {
       minLength: minLength(8),
@@ -163,7 +175,7 @@ export default {
       sameAsPassword: sameAs('password')
     },
     conditions: {
-      required
+      sameAs: sameAs(() => true)
     }
   },
   mixins: [Register],
diff --git a/components/core/blocks/Checkout/OrderReview.vue b/components/core/blocks/Checkout/OrderReview.vue
index 0899de8..2731a02 100644
--- a/components/core/blocks/Checkout/OrderReview.vue
+++ b/components/core/blocks/Checkout/OrderReview.vue
@@ -42,7 +42,7 @@
                 @blur="$v.orderReview.terms.$touch()"
                 v-model="orderReview.terms"
                 :validations="[{
-                  condition: !$v.orderReview.terms.required && $v.orderReview.terms.$error,
+                  condition: !$v.orderReview.terms.sameAs && $v.orderReview.terms.$error,
                   text: $t('Field is required')
                 }]"
               >
@@ -108,7 +108,7 @@
 </template>
 
 <script>
-import { required } from 'vuelidate/lib/validators'
+import { sameAs } from 'vuelidate/lib/validators'
 import Composite from '@vue-storefront/core/mixins/composite'
 
 import BaseCheckbox from 'theme/components/core/blocks/Form/BaseCheckbox'
@@ -130,7 +130,7 @@ export default {
   validations: {
     orderReview: {
       terms: {
-        required
+        sameAs: sameAs(() => true)
       }
     }
   },
diff --git a/components/core/blocks/Checkout/PersonalDetails.vue b/components/core/blocks/Checkout/PersonalDetails.vue
index 9ccbe41..af1446a 100644
--- a/components/core/blocks/Checkout/PersonalDetails.vue
+++ b/components/core/blocks/Checkout/PersonalDetails.vue
@@ -139,7 +139,7 @@
               @blur="$v.acceptConditions.$touch()"
               v-model="acceptConditions"
               :validations="[{
-                condition: !$v.acceptConditions.required && $v.acceptConditions.$error,
+                condition: !$v.acceptConditions.sameAs && $v.acceptConditions.$error,
                 text: $t('You must accept the terms and conditions.')
               }]"
             >
@@ -256,7 +256,7 @@ export default {
       sameAsPassword: sameAs('password')
     },
     acceptConditions: {
-      required
+      sameAs: sameAs(() => true)
     }
   }
 }
diff --git a/components/core/blocks/Header/CompareIcon.vue b/components/core/blocks/Header/CompareIcon.vue
index 500d005..e45e700 100644
--- a/components/core/blocks/Header/CompareIcon.vue
+++ b/components/core/blocks/Header/CompareIcon.vue
@@ -1,5 +1,5 @@
 <template>
-  <router-link :to="localizedRoute('/compare')" class="compare-icon no-underline inline-flex" v-if="isActive">
+  <router-link :to="localizedRoute('/compare')" class="compare-icon no-underline inline-flex" v-if="isActive" data-testid="compare-list-icon">
     <i class="material-icons">compare</i>
     <span
       class="compare-count absolute flex center-xs middle-xs border-box py0 px2 h6 lh16 weight-700 cl-white bg-cl-silver"
diff --git a/components/core/blocks/Header/MicrocartIcon.vue b/components/core/blocks/Header/MicrocartIcon.vue
index ebf078b..ccd4785 100644
--- a/components/core/blocks/Header/MicrocartIcon.vue
+++ b/components/core/blocks/Header/MicrocartIcon.vue
@@ -21,7 +21,7 @@
 <script>
 import { mapGetters, mapActions } from 'vuex'
 import MicrocartIcon from '@vue-storefront/core/compatibility/components/blocks/Header/MicrocartIcon'
-import {syncCartWhenLocalStorageChange} from '@vue-storefront/core/modules/cart/helpers'
+import { syncCartWhenLocalStorageChange } from '@vue-storefront/core/modules/cart/helpers'
 
 export default {
   mounted () {
diff --git a/components/core/blocks/Header/WishlistIcon.vue b/components/core/blocks/Header/WishlistIcon.vue
index d299a9b..5081989 100644
--- a/components/core/blocks/Header/WishlistIcon.vue
+++ b/components/core/blocks/Header/WishlistIcon.vue
@@ -3,6 +3,7 @@
     type="button"
     class="inline-flex bg-cl-transparent brdr-none relative"
     @click="toggleWishlistPanel"
+    data-testid="wishlist-icon"
     :aria-label="$t('Open wishlist')"
   >
     <i class="material-icons">favorite_border</i>
diff --git a/components/core/blocks/Microcart/EditMode.vue b/components/core/blocks/Microcart/EditMode.vue
index 41ee04b..983ff30 100644
--- a/components/core/blocks/Microcart/EditMode.vue
+++ b/components/core/blocks/Microcart/EditMode.vue
@@ -33,7 +33,7 @@ export default {
       this.$store.dispatch('cart/configureItem', { product: this.product, configuration })
     },
     getEditedProduct (filter = {}) {
-      const selectedFilters = {...this.getSelectedOptions, [filter.type]: filter}
+      const selectedFilters = { ...this.getSelectedOptions, [filter.type]: filter }
       const sizeId = get(selectedFilters, 'size.id', '')
       const colorId = get(selectedFilters, 'color.id', '')
       const children = this.product.configurable_children || []
diff --git a/components/core/blocks/Microcart/Microcart.vue b/components/core/blocks/Microcart/Microcart.vue
index 4906034..8a3194e 100644
--- a/components/core/blocks/Microcart/Microcart.vue
+++ b/components/core/blocks/Microcart/Microcart.vue
@@ -222,7 +222,7 @@ export default {
       this.addCouponPressed = false
     },
     onEscapePress () {
-      this.toggleMicrocart()
+      this.$store.dispatch('ui/closeMicrocart')
     },
     clearCart () {
       this.$store.dispatch('notification/spawnNotification', {
diff --git a/components/core/blocks/Microcart/Product.vue b/components/core/blocks/Microcart/Product.vue
index a53eedf..a6a7145 100644
--- a/components/core/blocks/Microcart/Product.vue
+++ b/components/core/blocks/Microcart/Product.vue
@@ -135,7 +135,7 @@
 </template>
 
 <script>
-import { mapActions } from 'vuex'
+import { mapActions, mapState } from 'vuex'
 import config from 'config'
 import { currentStoreView } from '@vue-storefront/core/lib/multistore'
 import { formatProductLink } from '@vue-storefront/core/modules/url/helpers'
@@ -178,6 +178,9 @@ export default {
   },
   mixins: [Product, ProductOption, EditMode],
   computed: {
+    ...mapState({
+      isMicrocartOpen: state => state.ui.microcart
+    }),
     hasProductInfo () {
       return this.product.info && Object.keys(this.product.info).length > 0
     },
@@ -297,6 +300,14 @@ export default {
           const maxQuantity = await this.getQuantity()
           this.maxQuantity = maxQuantity
         }
+      }
+    },
+    isMicrocartOpen: {
+      async handler (isOpen) {
+        if (isOpen) {
+          const maxQuantity = await this.getQuantity()
+          this.maxQuantity = maxQuantity
+        }
       },
       immediate: true
     }
diff --git a/components/core/blocks/MyAccount/MyOrder.vue b/components/core/blocks/MyAccount/MyOrder.vue
index e34a73a..51a32e4 100644
--- a/components/core/blocks/MyAccount/MyOrder.vue
+++ b/components/core/blocks/MyAccount/MyOrder.vue
@@ -110,7 +110,7 @@
       <div class="col-xs-12 h4">
         <h4>{{ $t('Order informations') }}</h4>
         <div class="row">
-          <div class="col-sm-6 col-md-3">
+          <div class="col-sm-6 col-md-3" v-if="shippingAddress">
             <h5>{{ $t('Shipping address') }}</h5>
             <address>
               <p>{{ shippingAddress.firstname }} {{ shippingAddress.lastname }}</p>
@@ -119,7 +119,7 @@
               <p>{{ shippingAddress.country }}</p>
             </address>
           </div>
-          <div class="col-sm-6 col-md-3">
+          <div class="col-sm-6 col-md-3" v-if="order.shipping_description">
             <h5>{{ $t('Shipping method') }}</h5>
             <p>{{ order.shipping_description }}</p>
           </div>
@@ -175,7 +175,7 @@ export default {
   mounted () {
     this.singleOrderItems.forEach(async item => {
       if (!this.itemThumbnail[item.sku]) {
-        const product = await this.getProduct({ options: { sku: item.sku }, setCurrentProduct: false, setCurrentCategoryPath: false, selectDefaultVariant: false })
+        const product = await this.getProduct({ options: { sku: item.sku } })
         const thumbnail = productThumbnailPath(product)
         Vue.set(this.itemThumbnail, item.sku, getThumbnailPath(thumbnail, 280, 280))
       }
diff --git a/components/core/blocks/Product/Related.vue b/components/core/blocks/Product/Related.vue
index 9d62b0c..4a3c1c0 100644
--- a/components/core/blocks/Product/Related.vue
+++ b/components/core/blocks/Product/Related.vue
@@ -69,16 +69,18 @@ export default {
       }
       let relatedProductsQuery = prepareRelatedQuery(key, sku)
 
-      const response = await this.$store.dispatch('product/list', {
+      const { items } = await this.$store.dispatch('product/findProducts', {
         query: relatedProductsQuery,
         size: 8,
-        prefetchGroupProducts: false,
-        updateState: false
+        options: {
+          populateRequestCacheTags: false,
+          prefetchGroupProducts: false
+        }
       })
-      if (response) {
+      if (items.length) {
         this.$store.dispatch('product/related', {
           key: this.type,
-          items: response.items
+          items: items
         })
         this.$forceUpdate()
       }
diff --git a/components/core/blocks/SidebarMenu/SubBtn.vue b/components/core/blocks/SidebarMenu/SubBtn.vue
index 0a35196..3480b46 100644
--- a/components/core/blocks/SidebarMenu/SubBtn.vue
+++ b/components/core/blocks/SidebarMenu/SubBtn.vue
@@ -51,7 +51,7 @@ export default {
   },
   methods: {
     next () {
-      if (config.entities.category.categoriesDynamicPrefetch && this.isCategory) this.$store.dispatch('category/list', { parent: this.id })
+      if (config.entities.category.categoriesDynamicPrefetch && this.isCategory) this.$store.dispatch('category-next/fetchMenuCategories', { parent: this.id })
       this.$store.commit('ui/setSubmenu', {
         id: this.id,
         depth: ++this.submenu.depth
diff --git a/components/core/blocks/SidebarMenu/SubCategory.vue b/components/core/blocks/SidebarMenu/SubCategory.vue
index 545c18a..6ee1741 100644
--- a/components/core/blocks/SidebarMenu/SubCategory.vue
+++ b/components/core/blocks/SidebarMenu/SubCategory.vue
@@ -122,7 +122,7 @@ export default {
       if (!config.entities.category.categoriesDynamicPrefetch && (this.categoryLinks && this.categoryLinks.length > 0 && this.categoryLinks[0].name)) { // we're using dynamic prefetching and getting just category.children_data.id from 1.7
         return this.categoryLinks
       } else {
-        return this.$store.state.category.list.filter(c => { return c.parent_id === this.id }) // return my child categories
+        return this.$store.getters['category-next/getMenuCategories'].filter(c => { return c.parent_id === this.id }) // return my child categories
       }
     },
     hasChildren () {
diff --git a/components/theme/blocks/AsyncSidebar/AsyncSidebar.vue b/components/theme/blocks/AsyncSidebar/AsyncSidebar.vue
index 6f484ae..a317c86 100644
--- a/components/theme/blocks/AsyncSidebar/AsyncSidebar.vue
+++ b/components/theme/blocks/AsyncSidebar/AsyncSidebar.vue
@@ -1,18 +1,21 @@
 <template>
-  <transition :name="direction === 'right' ? 'slide-left' : direction === 'left' ? 'slide-right' : null ">
-    <div
-      class="mw-100 fixed cl-accent bg-cl-primary"
-      :class="direction === 'left' ? 'left-sidebar' : direction === 'right' ? 'right-sidebar' : null "
-      data-testid="sidebar"
-      ref="sidebar"
-      v-if="isOpen"
-    >
-      <component :is="component" @close="$emit('close')" @reload="getComponent" />
-    </div>
-  </transition>
+  <no-ssr>
+    <transition :name="direction === 'right' ? 'slide-left' : direction === 'left' ? 'slide-right' : null ">
+      <div
+        class="mw-100 fixed cl-accent bg-cl-primary"
+        :class="direction === 'left' ? 'left-sidebar' : direction === 'right' ? 'right-sidebar' : null "
+        data-testid="sidebar"
+        ref="sidebar"
+        v-show="isOpen"
+      >
+        <component :is="component" @close="$emit('close')" @reload="getComponent" />
+      </div>
+    </transition>
+  </no-ssr>
 </template>
 
 <script>
+import NoSSR from 'vue-no-ssr'
 import LoadingSpinner from 'theme/components/theme/blocks/AsyncSidebar/LoadingSpinner.vue'
 import LoadingError from 'theme/components/theme/blocks/AsyncSidebar/LoadingError.vue'
 import { disableBodyScroll, clearAllBodyScrollLocks } from 'body-scroll-lock'
@@ -33,17 +36,20 @@ export default {
       default: 'right'
     }
   },
+  components: {
+    'no-ssr': NoSSR
+  },
   data () {
     return {
       component: null
     }
   },
-  created () {
-    this.getComponent()
-  },
   watch: {
     isOpen (state) {
       if (state) {
+        if (!this.component) {
+          this.getComponent()
+        }
         this.$nextTick(() => {
           disableBodyScroll(this.$refs.sidebar)
         })
diff --git a/components/theme/blocks/Collection/Collection.vue b/components/theme/blocks/Collection/Collection.vue
index 5b953fb..ca66600 100644
--- a/components/theme/blocks/Collection/Collection.vue
+++ b/components/theme/blocks/Collection/Collection.vue
@@ -46,15 +46,19 @@ export default {
     }
   },
   async beforeMount () {
-    let inspirationsQuery = prepareQuery({queryConfig: 'inspirations'})
+    let inspirationsQuery = prepareQuery({ queryConfig: 'inspirations' })
 
-    const res = await this.$store.dispatch('product/list', {
+    const { items } = await this.$store.dispatch('product/findProducts', {
       query: inspirationsQuery,
       size: 12,
-      sort: 'created_at:desc'
+      sort: 'created_at:desc',
+      options: {
+        populateRequestCacheTags: false,
+        prefetchGroupProducts: false
+      }
     })
-    if (res) {
-      this.products = res.items
+    if (items.length) {
+      this.products = items
     }
   },
   components: {
diff --git a/components/theme/blocks/Inspirations/Inspirations.vue b/components/theme/blocks/Inspirations/Inspirations.vue
index 0ec1c91..0b86608 100644
--- a/components/theme/blocks/Inspirations/Inspirations.vue
+++ b/components/theme/blocks/Inspirations/Inspirations.vue
@@ -16,17 +16,20 @@ import InspirationTile from './InspirationTile.vue'
 export default {
   name: 'Inspirations',
 
-  beforeMount () {
-    let inspirationsQuery = prepareQuery({queryConfig: 'inspirations'})
-    this.$store.dispatch('product/list', {
+  async beforeMount () {
+    let inspirationsQuery = prepareQuery({ queryConfig: 'inspirations' })
+    const { items } = await this.$store.dispatch('product/findProducts', {
       query: inspirationsQuery,
       size: 3,
-      sort: 'created_at:desc'
-    }).then(res => {
-      if (res) {
-        this.products = res.items
+      sort: 'created_at:desc',
+      options: {
+        populateRequestCacheTags: false,
+        prefetchGroupProducts: false
       }
     })
+    if (items.length) {
+      this.products = items
+    }
   },
 
   data () {
diff --git a/components/theme/blocks/Reviews/ReviewsList.vue b/components/theme/blocks/Reviews/ReviewsList.vue
index 18180e3..03b8b24 100644
--- a/components/theme/blocks/Reviews/ReviewsList.vue
+++ b/components/theme/blocks/Reviews/ReviewsList.vue
@@ -36,7 +36,7 @@
 
 <script>
 import { currentStoreView } from '@vue-storefront/core/lib/multistore'
-import {reviewJsonLd} from '@vue-storefront/core/helpers'
+import { reviewJsonLd } from '@vue-storefront/core/helpers'
 export default {
   props: {
     perPage: {
diff --git a/layouts/Default.vue b/layouts/Default.vue
index 595171d..05a76bf 100644
--- a/layouts/Default.vue
+++ b/layouts/Default.vue
@@ -85,7 +85,12 @@ export default {
       this.$bus.$emit('modal-show', 'modal-order-confirmation')
     },
     fetchMenuData () {
-      return this.$store.dispatch('category/list', { level: config.entities.category.categoriesDynamicPrefetch && config.entities.category.categoriesDynamicPrefetchLevel >= 0 ? config.entities.category.categoriesDynamicPrefetchLevel : null, includeFields: config.entities.optimize && isServer ? config.entities.category.includeFields : null, skipCache: isServer })
+      return this.$store.dispatch('category-next/fetchMenuCategories', {
+        level: config.entities.category.categoriesDynamicPrefetch && config.entities.category.categoriesDynamicPrefetchLevel >= 0
+          ? config.entities.category.categoriesDynamicPrefetchLevel
+          : null,
+        skipCache: isServer
+      })
     }
   },
   serverPrefetch () {
diff --git a/package.json b/package.json
index dac056b..b39cefc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/theme-default",
-  "version": "1.11.2",
+  "version": "1.12.0",
   "description": "Default theme for Vue Storefront",
   "main": "index.js",
   "scripts": {
diff --git a/pages/Category.vue b/pages/Category.vue
index d294a60..58cad2a 100644
--- a/pages/Category.vue
+++ b/pages/Category.vue
@@ -84,6 +84,7 @@ import ProductListing from '../components/core/ProductListing.vue'
 import Breadcrumbs from '../components/core/Breadcrumbs.vue'
 import SortBy from '../components/core/SortBy.vue'
 import { isServer } from '@vue-storefront/core/helpers'
+import { Logger } from '@vue-storefront/core/lib/logger'
 import { getSearchOptionsFromRouteParams } from '@vue-storefront/core/modules/catalog-next/helpers/categoryHelpers'
 import config from 'config'
 import Columns from '../components/core/Columns.vue'
@@ -102,15 +103,14 @@ const composeInitialPageState = async (store, route, forceLoad = false) => {
     const filters = getSearchOptionsFromRouteParams(route.params)
     const cachedCategory = store.getters['category-next/getCategoryFrom'](route.path)
     const currentCategory = cachedCategory && !forceLoad ? cachedCategory : await store.dispatch('category-next/loadCategory', { filters })
-    if (!store.getters['url/isBackRoute']) {
-      await store.dispatch('category-next/loadCategoryProducts', {route, category: currentCategory, pageSize: THEME_PAGE_SIZE})
-    }
+    const pageSize = store.getters['url/isBackRoute'] ? store.getters['url/getCurrentRoute'].categoryPageSize : THEME_PAGE_SIZE
+    await store.dispatch('category-next/loadCategoryProducts', { route, category: currentCategory, pageSize })
     const breadCrumbsLoader = store.dispatch('category-next/loadCategoryBreadcrumbs', { category: currentCategory, currentRouteName: currentCategory.name, omitCurrent: true })
 
     if (isServer) await breadCrumbsLoader
     catalogHooksExecutors.categoryPageVisited(currentCategory)
   } catch (e) {
-    console.error('Problem with setting Category initial data!', e)
+    Logger.error('Problem with setting Category initial data!', 'category', e)()
   }
 }
 
@@ -148,7 +148,8 @@ export default {
       return this.getCategoryProductsTotal === 0
     }
   },
-  async asyncData ({ store, route }) { // this is for SSR purposes to prefetch data - and it's always executed before parent component methods
+  async asyncData ({ store, route, context }) { // this is for SSR purposes to prefetch data - and it's always executed before parent component methods
+    if (context) context.output.cacheTags.add('category')
     await composeInitialPageState(store, route)
   },
   async beforeRouteEnter (to, from, next) {
@@ -187,7 +188,7 @@ export default {
       try {
         await this.$store.dispatch('category-next/loadMoreCategoryProducts')
       } catch (e) {
-        console.error('Problem with fetching more products', e)
+        Logger.error('Problem with fetching more products', 'category', e)()
       } finally {
         this.loadingProducts = false
       }
diff --git a/pages/Home.vue b/pages/Home.vue
index 665d3dc..11d7e0b 100755
--- a/pages/Home.vue
+++ b/pages/Home.vue
@@ -39,8 +39,6 @@
 import { isServer, onlineHelper } from '@vue-storefront/core/helpers'
 import LazyHydrate from 'vue-lazy-hydration'
 
-// Core pages
-import Home from '@vue-storefront/core/pages/Home'
 // Theme core components
 import ProductListing from 'theme/components/core/ProductListing'
 import HeadImage from 'theme/components/core/blocks/MainSlider/HeadImage'
@@ -48,11 +46,11 @@ import HeadImage from 'theme/components/core/blocks/MainSlider/HeadImage'
 import Onboard from 'theme/components/theme/blocks/Home/Onboard'
 import PromotedOffers from 'theme/components/theme/blocks/PromotedOffers/PromotedOffers'
 import TileLinks from 'theme/components/theme/blocks/TileLinks/TileLinks'
-import {Logger} from '@vue-storefront/core/lib/logger'
-import {mapGetters} from 'vuex'
+import { Logger } from '@vue-storefront/core/lib/logger'
+import { mapGetters } from 'vuex'
 import config from 'config'
-import {registerModule} from '@vue-storefront/core/lib/modules'
-import {RecentlyViewedModule} from '@vue-storefront/core/modules/recently-viewed'
+import { registerModule } from '@vue-storefront/core/lib/modules'
+import { RecentlyViewedModule } from '@vue-storefront/core/modules/recently-viewed'
 
 export default {
   data () {
@@ -60,7 +58,6 @@ export default {
       loading: true
     }
   },
-  mixins: [Home],
   components: {
     HeadImage,
     Onboard,
@@ -106,8 +103,9 @@ export default {
       localStorage.removeItem('redirect')
     }
   },
-  async asyncData ({ store, route }) { // this is for SSR purposes to prefetch data
-    Logger.info('Calling asyncData in Home (theme)')()
+  async asyncData ({ store, route, context }) { // this is for SSR purposes to prefetch data
+    if (context) context.output.cacheTags.add(`home`)
+    Logger.info('Calling asyncData in Home Page (core)')()
 
     await Promise.all([
       store.dispatch('homepage/fetchNewCollection'),
@@ -125,6 +123,12 @@ export default {
     } else {
       next()
     }
+  },
+  metaInfo () {
+    return {
+      title: this.$route.meta.title || this.$i18n.t('Home Page'),
+      meta: this.$route.meta.description ? [{ vmid: 'description', name: 'description', content: this.$route.meta.description }] : []
+    }
   }
 }
 </script>
diff --git a/pages/MyAccount.vue b/pages/MyAccount.vue
index ce7a595..588752e 100644
--- a/pages/MyAccount.vue
+++ b/pages/MyAccount.vue
@@ -46,8 +46,8 @@ import MyOrders from '../components/core/blocks/MyAccount/MyOrders'
 import MyOrder from '../components/core/blocks/MyAccount/MyOrder'
 import MyRecentlyViewed from '../components/core/blocks/MyAccount/MyRecentlyViewed'
 import NoSSR from 'vue-no-ssr'
-import {RecentlyViewedModule} from '@vue-storefront/core/modules/recently-viewed'
-import {registerModule} from '@vue-storefront/core/lib/modules'
+import { RecentlyViewedModule } from '@vue-storefront/core/modules/recently-viewed'
+import { registerModule } from '@vue-storefront/core/lib/modules'
 
 export default {
   data () {
diff --git a/pages/Product.vue b/pages/Product.vue
index 872cfe9..2dbd275 100644
--- a/pages/Product.vue
+++ b/pages/Product.vue
@@ -163,8 +163,8 @@
     </section>
     <lazy-hydrate when-idle>
       <reviews
-        :product-name="getOriginalProduct.name"
-        :product-id="getOriginalProduct.id"
+        :product-name="getCurrentProduct.name"
+        :product-id="getCurrentProduct.id"
         v-show="isOnline"
         :product="getCurrentProduct"
       />
@@ -222,6 +222,7 @@ import { onlineHelper, isServer, productJsonLd } from '@vue-storefront/core/help
 import { catalogHooksExecutors } from '@vue-storefront/core/modules/catalog-next/hooks'
 import ProductPrice from 'theme/components/core/ProductPrice.vue'
 import { doPlatformPricesSync } from '@vue-storefront/core/modules/catalog/helpers'
+import { filterChangedProduct } from '@vue-storefront/core/modules/catalog/events'
 
 export default {
   components: {
@@ -268,7 +269,6 @@ export default {
       getCurrentProduct: 'product/getCurrentProduct',
       getProductGallery: 'product/getProductGallery',
       getCurrentProductConfiguration: 'product/getCurrentProductConfiguration',
-      getOriginalProduct: 'product/getOriginalProduct',
       attributesByCode: 'attribute/attributeListByCode',
       getCurrentCustomOptions: 'product/getCurrentCustomOptions'
     }),
@@ -331,7 +331,8 @@ export default {
   async mounted () {
     await this.$store.dispatch('recently-viewed/addItem', this.getCurrentProduct)
   },
-  async asyncData ({ store, route }) {
+  async asyncData ({ store, route, context }) {
+    if (context) context.output.cacheTags.add('product')
     const product = await store.dispatch('product/loadProduct', { parentSku: route.params.parentSku, childSku: route && route.params && route.params.childSku ? route.params.childSku : null })
     const loadBreadcrumbsPromise = store.dispatch('product/loadProductBreadcrumbs', { product })
     if (isServer) await loadBreadcrumbsPromise
@@ -378,11 +379,9 @@ export default {
         action1: { label: this.$t('OK') }
       })
     },
-    changeFilter (variant) {
-      this.$bus.$emit(
-        'filter-changed-product',
-        Object.assign({ attribute_code: variant.type }, variant)
-      )
+    async changeFilter (variant) {
+      const selectedConfiguration = Object.assign({ attribute_code: variant.type }, variant)
+      await filterChangedProduct(selectedConfiguration, this.$store, this.$router)
       this.getQuantity()
     },
     openSizeGuide () {
diff --git a/pages/Static.vue b/pages/Static.vue
index c681ee8..f926699 100644
--- a/pages/Static.vue
+++ b/pages/Static.vue
@@ -45,7 +45,7 @@ export default {
   metaInfo () {
     return {
       title: this.$route.meta.title || this.$props.title,
-      meta: this.$route.meta.description ? [{vmid: 'description', description: this.$route.meta.description}] : []
+      meta: this.$route.meta.description ? [{ vmid: 'description', description: this.$route.meta.description }] : []
     }
   },
   props: {
diff --git a/resource/i18n/ar-SY.csv b/resource/i18n/ar-SY.csv
index 63c51ef..6f1937e 100644
--- a/resource/i18n/ar-SY.csv
+++ b/resource/i18n/ar-SY.csv
@@ -1,4 +1,5 @@
 "About us","من نحن"
+"Accepts only alphabet characters.","Accepts only alphabet characters."
 "Add a discount code","أدخل رمز الخصم"
 "Add discount code","إرسال"
 "Add to cart","أضف إلى السلّة"
diff --git a/resource/i18n/cs-CZ.csv b/resource/i18n/cs-CZ.csv
index 1ba94eb..36fa339 100644
--- a/resource/i18n/cs-CZ.csv
+++ b/resource/i18n/cs-CZ.csv
@@ -1,4 +1,5 @@
 "About us","O nás"
+"Accepts only alphabet characters.","Accepts only alphabet characters."
 "Add a discount code","Přidejte kód pro slevu"
 "Add discount code","Použít"
 "Add to cart","Přidat do košíku"
diff --git a/resource/i18n/de-DE.csv b/resource/i18n/de-DE.csv
index a910543..4cd3a4c 100644
--- a/resource/i18n/de-DE.csv
+++ b/resource/i18n/de-DE.csv
@@ -1,5 +1,6 @@
 "About us (Magento CMS)","Über uns (Magento CMS)"
 "About us","Über uns"
+"Accepts only alphabet characters.","Accepts only alphabet characters."
 "Add a discount code","Einen Rabatt-Code hinzufügen"
 "Add discount code","Rabatt-Code hinzufügen"
 "Add to cart","In den Warenkorb"
diff --git a/resource/i18n/en-US.csv b/resource/i18n/en-US.csv
index e0cf8a4..eb42fa3 100644
--- a/resource/i18n/en-US.csv
+++ b/resource/i18n/en-US.csv
@@ -1,6 +1,7 @@
 "A customer with the same email already exists in an associated website.","A customer with the same email already exists in an associated website."
 "About us (Magento CMS)","About us (Magento CMS)"
 "About us","About us"
+"Accepts only alphabet characters.","Accepts only alphabet characters."
 "Add a discount code","Add a discount code"
 "Add discount code","Apply"
 "Add to cart","Add to cart"
@@ -165,6 +166,7 @@
 "Product Name","Product Name"
 "Product details","Product details"
 "Products","Products"
+"Provided email does not exist","Provided email does not exist"
 "Purchase","Purchase"
 "Qty","Qty"
 "Quantity","Quantity"
@@ -293,4 +295,3 @@
 "to find product you were looking for.","to find product you were looking for."
 "to find something beautiful for You!","to find something beautiful for You!"
 "{count} items","{count} items"
-"Provided email does not exist","Provided email does not exist"
\ No newline at end of file
diff --git a/resource/i18n/es-ES.csv b/resource/i18n/es-ES.csv
index af2bfcf..2a16725 100644
--- a/resource/i18n/es-ES.csv
+++ b/resource/i18n/es-ES.csv
@@ -1,4 +1,5 @@
 "About us","Sobre nosotros"
+"Accepts only alphabet characters.","Accepts only alphabet characters."
 "Add to cart","Añadir a la cesta"
 "Add to compare","Añadir a comparar"
 "Add to favorite","Agregar a Favoritos"
diff --git a/resource/i18n/et-EE.csv b/resource/i18n/et-EE.csv
index b28b020..9b0815d 100644
--- a/resource/i18n/et-EE.csv
+++ b/resource/i18n/et-EE.csv
@@ -1,6 +1,7 @@
 "A customer with the same email already exists in an associated website.","Sama e-postiga klient juba eksisteerib."
 "About us (Magento CMS)","About us (Magento CMS)"
 "About us",Meist
+"Accepts only alphabet characters.","Accepts only alphabet characters."
 "Add a discount code","Lisa sooduskood"
 "Add discount code","Lisa sooduskood"
 "Add to cart",Osta
diff --git a/resource/i18n/fi-FI.csv b/resource/i18n/fi-FI.csv
index 2f39b11..ef5f15f 100644
--- a/resource/i18n/fi-FI.csv
+++ b/resource/i18n/fi-FI.csv
@@ -1,6 +1,7 @@
 "A customer with the same email already exists in an associated website.","Samalla sähköpostiosoitteella on jo asiakas samalla sivustolla."
 "About us (Magento CMS)","Tietoja verkkokaupasta (Magento CMS)"
 "About us","Tietoja verkkokaupasta"
+"Accepts only alphabet characters.","Accepts only alphabet characters."
 "Add a discount code","Lisää alennuskoodi"
 "Add discount code","Lisää alennuskoodi"
 "Add to cart","Lisää koriin"
diff --git a/resource/i18n/fr-FR.csv b/resource/i18n/fr-FR.csv
index 40c8d3c..b76872f 100644
--- a/resource/i18n/fr-FR.csv
+++ b/resource/i18n/fr-FR.csv
@@ -1,4 +1,5 @@
 "About us","À propos"
+"Accepts only alphabet characters.","Accepts only alphabet characters."
 "Add a discount code","Ajouter un code de réduction"
 "Add discount code","Appliquer"
 "Add to cart","Ajouter au panier"
diff --git a/resource/i18n/it-IT.csv b/resource/i18n/it-IT.csv
index a8f86e7..971ed4c 100644
--- a/resource/i18n/it-IT.csv
+++ b/resource/i18n/it-IT.csv
@@ -1,6 +1,7 @@
 "A customer with the same email already exists in an associated website.","Esiste già un account registrato con questo indirizzo email."
 "About us (Magento CMS)","Chi siamo (Magento CMS)"
 "About us","Chi siamo"
+"Accepts only alphabet characters.","Accepts only alphabet characters."
 "Add a discount code","Aggiungi un codice sconto"
 "Add discount code","Applica"
 "Add to cart","Aggiungi al carrello"
diff --git a/resource/i18n/ja-JP.csv b/resource/i18n/ja-JP.csv
index d42b00e..e2fa669 100644
--- a/resource/i18n/ja-JP.csv
+++ b/resource/i18n/ja-JP.csv
@@ -1,4 +1,5 @@
 "About us","About us"
+"Accepts only alphabet characters.","Accepts only alphabet characters."
 "Add a discount code","ディスカウントコードを追加する"
 "Add discount code","申し込み"
 "Add to cart","カートに追加"
diff --git a/resource/i18n/nl-NL.csv b/resource/i18n/nl-NL.csv
index 8d09859..1bce6a7 100644
--- a/resource/i18n/nl-NL.csv
+++ b/resource/i18n/nl-NL.csv
@@ -1,3 +1,4 @@
+"Accepts only alphabet characters.","Accepts only alphabet characters."
 "Please change Your search criteria and try again. If still not finding anything relevant, please visit the Home page and try out some of our bestsellers!","Pas uw zoekcriteria aan en probeer het opnieuw. Als u nog steeds niks relevants kan vinden, bezoek dan de homepage en bekijk onze bestsellers!"
 "Select ","Selecteer "
 "You are offline. Some features might not be available.","U bent momenteel offline, niet alle onderdelen van de shop zullen volledig werken"
diff --git a/resource/i18n/pl-PL.csv b/resource/i18n/pl-PL.csv
index 8f10161..8d0189d 100644
--- a/resource/i18n/pl-PL.csv
+++ b/resource/i18n/pl-PL.csv
@@ -1,4 +1,5 @@
 "About us","O nas"
+"Accepts only alphabet characters.","Accepts only alphabet characters."
 "Add a discount code","Dodaj kod rabatowy"
 "Add discount code","Dodaj kod rabatowy"
 "Add to cart","Dodaj do koszyka"
diff --git a/resource/i18n/pt-BR.csv b/resource/i18n/pt-BR.csv
index fe2164c..d373ec4 100644
--- a/resource/i18n/pt-BR.csv
+++ b/resource/i18n/pt-BR.csv
@@ -1,4 +1,5 @@
 "About us","Sobre nós"
+"Accepts only alphabet characters.","Accepts only alphabet characters."
 "Add a discount code","Adicionar cupom de desconto"
 "Add discount code","Aplicar"
 "Add to cart","Adicionar ao carrinho"
diff --git a/resource/i18n/ru-RU.csv b/resource/i18n/ru-RU.csv
index 060ba2f..fad6daf 100644
--- a/resource/i18n/ru-RU.csv
+++ b/resource/i18n/ru-RU.csv
@@ -1,4 +1,5 @@
 "About us","О нас"
+"Accepts only alphabet characters.","Accepts only alphabet characters."
 "Add a discount code","Ввести скидочный код"
 "Add discount code","Применить"
 "Add to cart","Добавить в корзину"
diff --git a/resource/i18n/zh-cn.csv b/resource/i18n/zh-cn.csv
index 176ecce..7c4e7b6 100644
--- a/resource/i18n/zh-cn.csv
+++ b/resource/i18n/zh-cn.csv
@@ -1,5 +1,6 @@
 "About us (Magento CMS)","关于我们(Magento CMS)"
 "About us","关于我们"
+"Accepts only alphabet characters.","Accepts only alphabet characters."
 "Add a discount code","A添加折扣代码"
 "Add to cart","加入购物车"
 "Add to compare","商品比较"
diff --git a/router/index.js b/router/index.js
index 7e1eec9..4129624 100644
--- a/router/index.js
+++ b/router/index.js
@@ -13,27 +13,27 @@ const ResetPassword = () => import(/* webpackChunkName: "vsf-reset-password" */
 let routes = [
   { name: 'home', path: '/', component: Home, alias: '/pwa.html' },
   { name: 'checkout', path: '/checkout', component: Checkout },
-  { name: 'legal', path: '/legal', component: Static, props: {page: 'lorem', title: 'Legal Notice'}, meta: {title: 'Legal Notice', description: 'Legal Notice - example of description usage'} },
-  { name: 'privacy', path: '/privacy', component: Static, props: {page: 'lorem', title: 'Privacy'} },
-  { name: 'magazine', path: '/magazine', component: Static, props: {page: 'lorem', title: 'Magazine'} },
-  { name: 'sale', path: '/sale', component: Static, props: {page: 'lorem', title: 'Sale'} },
-  { name: 'order-tracking', path: '/order-tracking', component: Static, props: {page: 'lorem', title: 'Track my Order'} },
+  { name: 'legal', path: '/legal', component: Static, props: { page: 'lorem', title: 'Legal Notice' }, meta: { title: 'Legal Notice', description: 'Legal Notice - example of description usage' } },
+  { name: 'privacy', path: '/privacy', component: Static, props: { page: 'lorem', title: 'Privacy' } },
+  { name: 'magazine', path: '/magazine', component: Static, props: { page: 'lorem', title: 'Magazine' } },
+  { name: 'sale', path: '/sale', component: Static, props: { page: 'lorem', title: 'Sale' } },
+  { name: 'order-tracking', path: '/order-tracking', component: Static, props: { page: 'lorem', title: 'Track my Order' } },
   { name: 'my-account', path: '/my-account', component: MyAccount },
   { name: 'my-shipping-details', path: '/my-account/shipping-details', component: MyAccount, props: { activeBlock: 'MyShippingDetails' } },
   { name: 'my-newsletter', path: '/my-account/newsletter', component: MyAccount, props: { activeBlock: 'MyNewsletter' } },
   { name: 'my-orders', path: '/my-account/orders', component: MyAccount, props: { activeBlock: 'MyOrders' } },
   { name: 'my-order', path: '/my-account/orders/:orderId', component: MyAccount, props: { activeBlock: 'MyOrder' } },
   { name: 'my-recently-viewed', path: '/my-account/recently-viewed', component: MyAccount, props: { activeBlock: 'MyRecentlyViewed' } },
-  { name: 'about-us', path: '/about-us', component: Static, props: {page: 'lorem', title: 'About us'} },
-  { name: 'customer-service', path: '/customer-service', component: Static, props: {page: 'lorem', title: 'Customer service'} },
-  { name: 'store-locator', path: '/store-locator', component: Static, props: {page: 'lorem', title: 'Store locator'} },
-  { name: 'size-guide', path: '/size-guide', component: Static, props: {page: 'lorem', title: 'Size guide'} },
-  { name: 'gift-card', path: '/gift-card', component: Static, props: {page: 'lorem', title: 'Gift card'} },
-  { name: 'delivery', path: '/delivery', component: Static, props: {page: 'lorem', title: 'Delivery'} },
-  { name: 'returns', path: '/returns', component: Static, props: {page: 'lorem', title: 'Returns policy'} },
-  { name: 'order-from-catalog', path: '/order-from-catalog', component: Static, props: {page: 'lorem', title: 'Order from catalog'} },
-  { name: 'contact', path: '/contact', component: Static, props: {page: 'contact', title: 'Contact'} },
-  { name: 'compare', path: '/compare', component: Compare, props: {title: 'Compare Products'} },
+  { name: 'about-us', path: '/about-us', component: Static, props: { page: 'lorem', title: 'About us' } },
+  { name: 'customer-service', path: '/customer-service', component: Static, props: { page: 'lorem', title: 'Customer service' } },
+  { name: 'store-locator', path: '/store-locator', component: Static, props: { page: 'lorem', title: 'Store locator' } },
+  { name: 'size-guide', path: '/size-guide', component: Static, props: { page: 'lorem', title: 'Size guide' } },
+  { name: 'gift-card', path: '/gift-card', component: Static, props: { page: 'lorem', title: 'Gift card' } },
+  { name: 'delivery', path: '/delivery', component: Static, props: { page: 'lorem', title: 'Delivery' } },
+  { name: 'returns', path: '/returns', component: Static, props: { page: 'lorem', title: 'Returns policy' } },
+  { name: 'order-from-catalog', path: '/order-from-catalog', component: Static, props: { page: 'lorem', title: 'Order from catalog' } },
+  { name: 'contact', path: '/contact', component: Static, props: { page: 'contact', title: 'Contact' } },
+  { name: 'compare', path: '/compare', component: Compare, props: { title: 'Compare Products' } },
   { name: 'error', path: '/error', component: ErrorPage, meta: { layout: 'minimal' } },
   { name: 'virtual-product', path: '/p/:parentSku/:slug', component: Product }, // :sku param can be marked as optional with ":sku?" (https://github.com/vuejs/vue-router/blob/dev/examples/route-matching/app.js#L16), but it requires a lot of work to adjust the rest of the site
   { name: 'bundle-product', path: '/p/:parentSku/:slug', component: Product }, // :sku param can be marked as optional with ":sku?" (https://github.com/vuejs/vue-router/blob/dev/examples/route-matching/app.js#L16), but it requires a lot of work to adjust the rest of the site
diff --git a/store/homepage.ts b/store/homepage.ts
index 5607cec..eab0a29 100644
--- a/store/homepage.ts
+++ b/store/homepage.ts
@@ -10,25 +10,30 @@ export const homepageStore = {
     async fetchNewCollection ({ commit, dispatch }) {
       const newProductsQuery = prepareQuery({ queryConfig: 'newProducts' })
 
-      const newProductsResult = await dispatch('product/list', {
+      const { items } = await dispatch('product/findProducts', {
         query: newProductsQuery,
         size: 8,
-        sort: 'created_at:desc'
+        sort: 'created_at:desc',
+        options: {
+          populateRequestCacheTags: true,
+          prefetchGroupProducts: false
+        }
       }, { root: true })
-      const configuredProducts = await dispatch(
-        'category-next/configureProducts',
-        { products: newProductsResult.items
-        }, { root: true })
-      commit('SET_NEW_COLLECTION', configuredProducts)
+
+      commit('SET_NEW_COLLECTION', items)
     },
     async loadBestsellers ({ commit, dispatch }) {
-      const response = await dispatch('product/list', {
+      const { items } = await dispatch('product/findProducts', {
         query: prepareQuery({ queryConfig: 'bestSellers' }),
         size: 8,
-        sort: 'created_at:desc'
+        sort: 'created_at:desc',
+        options: {
+          populateRequestCacheTags: true,
+          prefetchGroupProducts: false
+        }
       }, { root: true })
 
-      commit('SET_BESTSELLERS', response.items)
+      commit('SET_BESTSELLERS', items)
     }
   },
   mutations: {
diff --git a/store/promoted-offers.ts b/store/promoted-offers.ts
index a118f9b..c83bba6 100644
--- a/store/promoted-offers.ts
+++ b/store/promoted-offers.ts
@@ -26,7 +26,7 @@ export const promotedStore = {
     getHeadImage: state => state.headImage
   },
   actions: {
-    async updatePromotedOffers ({commit, rootState}, data) {
+    async updatePromotedOffers ({ commit, rootState }, data) {
       let promotedBannersResource = rootState.storeView && rootState.storeView.storeCode ? `banners/${rootState.storeView.storeCode}_promoted_offers` : `promoted_offers`
       try {
         // Workaround to get jest --watch to work so don't change the import sting to a template string
@@ -36,7 +36,7 @@ export const promotedStore = {
         Logger.debug('Unable to load promotedOffers' + err)()
       }
     },
-    async updateHeadImage ({commit, rootState}, data) {
+    async updateHeadImage ({ commit, rootState }, data) {
       let mainImageResource = rootState.storeView && rootState.storeView.storeCode ? `banners/${rootState.storeView.storeCode}_main-image` : `main-image`
       try {
         // Workaround to get jest --watch to work so don't change the import sting to a template string
diff --git a/store/ui.ts b/store/ui.ts
index e1a6f8c..a92769c 100644
--- a/store/ui.ts
+++ b/store/ui.ts
@@ -62,6 +62,12 @@ export const uiStore = {
     },
     toggleWishlist ({ commit, state }) {
       commit('setWishlist', !state.wishlist)
+    },
+    closeMicrocart ({ commit, state }) {
+      if (state.microcart) commit('setMicrocart', false)
+    },
+    closeWishlist ({ commit, state }) {
+      if (state.wishlist) commit('setWishlist', false)
     }
   }
 }