diff --git a/src/_locales/cs/messages.json b/src/_locales/cs/messages.json
index d6ad287..5090b58 100755
--- a/src/_locales/cs/messages.json
+++ b/src/_locales/cs/messages.json
@@ -63,6 +63,9 @@
     "product_firefox-private-network-vpn": {
         "message": "Mozilla VPN"
     },
+    "product_hubs": {
+        "message": "Hubs"
+    },
     "congratulations": {
         "message": "Gratulujeme, všechny dotazy byly zodpovězeny."
     },
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 3a09914..8dbdb1b 100755
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -63,6 +63,9 @@
     "product_firefox-private-network-vpn": {
         "message": "Mozilla VPN"
     },
+    "product_hubs": {
+        "message": "Hubs"
+    },
     "congratulations": {
         "message": "Congratulations! All questions have been answered!"
     },
diff --git a/src/_locales/es/messages.json b/src/_locales/es/messages.json
index be2cde1..bb16dd6 100755
--- a/src/_locales/es/messages.json
+++ b/src/_locales/es/messages.json
@@ -63,6 +63,9 @@
     "product_firefox-private-network-vpn": {
         "message": "Mozilla VPN"
     },
+    "product_hubs": {
+        "message": "Hubs"
+    },
     "congratulations": {
         "message": "¡Felicidades! ¡Todas las preguntas han sido respondidas!"
     },
diff --git a/src/_locales/fr/messages.json b/src/_locales/fr/messages.json
index 6810a6f..5de4c39 100755
--- a/src/_locales/fr/messages.json
+++ b/src/_locales/fr/messages.json
@@ -63,6 +63,9 @@
     "product_firefox-private-network-vpn": {
         "message": "Mozilla VPN"
     },
+    "product_hubs": {
+        "message": "Hubs"
+    },
     "congratulations": {
         "message": "Félicitations ! Toutes les questions ont reçu une réponse !"
     },
diff --git a/src/_locales/hu/messages.json b/src/_locales/hu/messages.json
index e632346..b0aacbf 100755
--- a/src/_locales/hu/messages.json
+++ b/src/_locales/hu/messages.json
@@ -63,6 +63,9 @@
     "product_firefox-private-network-vpn": {
         "message": "Mozilla VPN"
     },
+    "product_hubs": {
+        "message": "Hubs"
+    },
     "congratulations": {
         "message": "Gratulálunk! Az összes kérdés megválaszolva!"
     },
diff --git a/src/_locales/pl/messages.json b/src/_locales/pl/messages.json
index c9c94c7..e9beac8 100644
--- a/src/_locales/pl/messages.json
+++ b/src/_locales/pl/messages.json
@@ -63,6 +63,9 @@
     "product_firefox-private-network-vpn": {
         "message": "Mozilla VPN"
     },
+    "product_hubs": {
+        "message": "Hubs"
+    },
     "congratulations": {
         "message": "Gratulacje! Odpowiedzi na wszystkie pytania zostały udzielone!"
     },
diff --git a/src/_locales/pt-BR/messages.json b/src/_locales/pt-BR/messages.json
index 1659b80..91ac6fb 100755
--- a/src/_locales/pt-BR/messages.json
+++ b/src/_locales/pt-BR/messages.json
@@ -63,6 +63,9 @@
     "product_firefox-private-network-vpn": {
         "message": "Mozilla VPN"
     },
+    "product_hubs": {
+        "message": "Hubs"
+    },
     "congratulations": {
         "message": "Parabéns! Todas as perguntas foram respondidas!"
     },
diff --git a/src/_locales/sv/messages.json b/src/_locales/sv/messages.json
index d5603ce..6901b18 100644
--- a/src/_locales/sv/messages.json
+++ b/src/_locales/sv/messages.json
@@ -63,6 +63,9 @@
     "product_firefox-private-network-vpn": {
         "message": "Mozilla VPN"
     },
+    "product_hubs": {
+        "message": "Hubs"
+    },
     "congratulations": {
         "message": "Grattis! Alla frågor har blivit besvarade!"
     },
diff --git a/src/html/preferences.html b/src/html/preferences.html
index 41f7279..501a286 100755
--- a/src/html/preferences.html
+++ b/src/html/preferences.html
@@ -84,6 +84,10 @@ <h3 data-i18n="products"></h3>
                 <input id="firefox-private-network-vpn" name="chooseProduct" type="checkbox" value="firefox-private-network-vpn">
                 <span data-i18n="product_firefox-private-network-vpn"></span>
             </label>
+            <label for="hubs">
+                <input id="hubs" name="chooseProduct" type="checkbox" value="hubs">
+                <span data-i18n="product_hubs"></span>
+            </label>
             <label for="thunderbird">
                 <input id="thunderbird" name="chooseProduct" type="checkbox" value="Thunderbird">
                 <span data-i18n="product_thunderbird"></span>
diff --git a/src/js/background.js b/src/js/background.js
index bb5b727..c12c424 100755
--- a/src/js/background.js
+++ b/src/js/background.js
@@ -344,7 +344,7 @@ function loadRequest(request) {
     }
 
     // Clean and save question list in Storage API
-    removeOld(responseSUMO.results, responseSUMO.results[0].product, responseSUMO.results[0].locale);
+    if (responseSUMO.results.length > 0) removeOld(responseSUMO.results, responseSUMO.results[0].product, responseSUMO.results[0].locale);
     questionList = newQuestionList.concat(questionList);
     browser.storage.local.set({
         'questions': questionList
diff --git a/src/res/products/hubs.png b/src/res/products/hubs.png
new file mode 100644
index 0000000..7fd4223
Binary files /dev/null and b/src/res/products/hubs.png differ