diff --git a/cypress/cypress.config.js b/cypress/cypress.config.js
index b1d80575e..db8308557 100644
--- a/cypress/cypress.config.js
+++ b/cypress/cypress.config.js
@@ -31,7 +31,8 @@ const { parsed } = dotenv.config({ path: '../backend/.env' })
 module.exports = defineConfig({
   e2e: {
     projectId: "qa7fe2",
-    defaultCommandTimeout: 10000,
+    defaultCommandTimeout: 60000,
+    pageLoadTimeout:180000,
     chromeWebSecurity: false,
     baseUrl: "http://localhost:3000",
     specPattern: "cypress/e2e/**/*.feature",
diff --git a/webapp/components/FilterMenu/FilterMenuComponent.vue b/webapp/components/FilterMenu/FilterMenuComponent.vue
index e362e758f..7897a285d 100644
--- a/webapp/components/FilterMenu/FilterMenuComponent.vue
+++ b/webapp/components/FilterMenu/FilterMenuComponent.vue
@@ -3,7 +3,7 @@
     <div class="filter-menu-options">
       <div class="filter-header">
         <h2 class="title">{{ $t('filter-menu.filter-by') }}</h2>
-        <div class="item-save-topics">
+        <div v-if="categoriesActive" class="item-save-topics">
           <labeled-button
             filled
             :label="$t('actions.saveCategories')"
@@ -62,18 +62,20 @@ export default {
   },
   methods: {
     saveCategories() {
-      this.$apollo
-        .mutate({
-          mutation: SaveCategories(),
-          variables: { activeCategories: this.filteredCategoryIds },
-        })
-        .then(() => {
-          this.$emit('showFilterMenu')
-          this.$toast.success(this.$t('filter-menu.save.success'))
-        })
-        .catch(() => {
-          this.$toast.error(this.$t('filter-menu.save.error'))
-        })
+      if (this.categoriesActive) {
+        this.$apollo
+          .mutate({
+            mutation: SaveCategories(),
+            variables: { activeCategories: this.filteredCategoryIds },
+          })
+          .then(() => {
+            this.$emit('showFilterMenu')
+            this.$toast.success(this.$t('filter-menu.save.success'))
+          })
+          .catch(() => {
+            this.$toast.error(this.$t('filter-menu.save.error'))
+          })
+      }
     },
   },
 }
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 7b5c4a903..6067119e1 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -19,7 +19,7 @@
       </client-only>
     </div>
     <div>
-      <div v-if="categoriesActive && SHOW_CONTENT_FILTER_MASONRY_GRID" class="top-filter-menu">
+      <div v-if="SHOW_CONTENT_FILTER_MASONRY_GRID" class="top-filter-menu">
         <div class="filterButtonBox">
           <div class="filterButtonMenu" :class="{ 'hide-filter': hideByScroll }">
             <base-button