diff --git a/src/components/marketing/sections/cta-sections/ShowcaseProducts.vue b/src/components/marketing/sections/cta-sections/ShowcaseProducts.vue
index 52d9396c2..a55ca3cfe 100644
--- a/src/components/marketing/sections/cta-sections/ShowcaseProducts.vue
+++ b/src/components/marketing/sections/cta-sections/ShowcaseProducts.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="py-8 mb-5">
     <div class="w-full text-center">
-      <p class="text-sm tracking-widest text-gray-700">{{ main.subtitle }}</p>
-      <h1 class="text-4xl mt-2 mb-6 leading-tight font-heading">
+      <p v-if="main !== null" class="text-sm tracking-widest text-gray-700">{{ main.subtitle }}</p>
+      <h1 v-if="main !== null" class="text-4xl mt-2 mb-6 leading-tight font-heading">
         {{ main.title }}
       </h1>
-      <g-image :src="img(main.image)" class="hidden md:block" />
+      <g-image v-if="main !== null" :src="img(main.image)" class="hidden md:block" />
     </div>
 
     <div class="grid grid-cols-1 gap-4 sm:grid-cols-2 sm:hidden">
diff --git a/src/templates/Tag.vue b/src/templates/Tag.vue
index d90115e41..687b5925c 100644
--- a/src/templates/Tag.vue
+++ b/src/templates/Tag.vue
@@ -1,6 +1,11 @@
 <template>
   <Layout :hideHeader="true" :disableScroll="true">
-    <TagFilterHeader :tags="tagTitles" :selected="title" v-if="tagTitles.length > 2"/>
+    <TagFilterHeader
+      @resetAll="resetAll"
+      :tags="tagTitles"
+      :selected="title"
+      v-if="tagTitles.length > 2"
+    />
     <div class="container sm:px-0 mx-auto overflow-x-hidden pt-12">
       <div class="mx-4 sm:mx-0">
         <h1 class="pb-0 mb-0 text-5xl font-medium capitalize">
@@ -188,7 +193,7 @@ export default {
         tags = this.$page.allBlogTag;
       }
 
-      var res = [{ title: "All", path: path }];
+      var res = [{ title: "All Tags", path: path }];
       tags.edges.forEach((edge) =>
         res.push({ title: edge.node.title, path: edge.node.path })
       );
@@ -216,6 +221,12 @@ export default {
       }
     },
   },
+
+  methods: {
+    resetAll() {
+      this.$router.push({ path: "/news" });
+    },
+  },
   mounted() {
     document.addEventListener("click", this.close);
   },