diff --git a/src/config/product.openshiftContainer.js b/src/config/product.openshiftContainer.js
index 86ff41aac..626ceb53f 100644
--- a/src/config/product.openshiftContainer.js
+++ b/src/config/product.openshiftContainer.js
@@ -362,6 +362,10 @@ const config = {
       id: RHSM_API_QUERY_SET_TYPES.GRANULARITY,
       isSecondary: true,
       position: SelectPosition.right
+    },
+    {
+      id: 'export',
+      isItem: true
     }
   ]
 };
diff --git a/src/config/product.openshiftDedicated.js b/src/config/product.openshiftDedicated.js
index cf04af82d..c1f6aa2c8 100644
--- a/src/config/product.openshiftDedicated.js
+++ b/src/config/product.openshiftDedicated.js
@@ -322,6 +322,10 @@ const config = {
       id: 'rangedMonthly',
       isSecondary: true,
       position: SelectPosition.right
+    },
+    {
+      id: 'export',
+      isItem: true
     }
   ]
 };
diff --git a/src/config/product.openshiftMetrics.js b/src/config/product.openshiftMetrics.js
index be9f75ea9..1bd24ffa3 100644
--- a/src/config/product.openshiftMetrics.js
+++ b/src/config/product.openshiftMetrics.js
@@ -299,6 +299,10 @@ const config = {
       id: 'rangedMonthly',
       isSecondary: true,
       position: SelectPosition.right
+    },
+    {
+      id: 'export',
+      isItem: true
     }
   ]
 };
diff --git a/src/config/product.rhacs.js b/src/config/product.rhacs.js
index 74727bc60..6f30a4ade 100644
--- a/src/config/product.rhacs.js
+++ b/src/config/product.rhacs.js
@@ -318,6 +318,10 @@ const config = {
       id: 'rangedMonthly',
       isSecondary: true,
       position: SelectPosition.right
+    },
+    {
+      id: 'export',
+      isItem: true
     }
   ]
 };
diff --git a/src/config/product.rhel.js b/src/config/product.rhel.js
index 017173e66..8e3752a21 100644
--- a/src/config/product.rhel.js
+++ b/src/config/product.rhel.js
@@ -362,6 +362,10 @@ const config = {
     },
     {
       id: RHSM_API_QUERY_SET_TYPES.CATEGORY
+    },
+    {
+      id: 'export',
+      isItem: true
     }
   ]
 };
diff --git a/src/config/product.rhelElsPayg.js b/src/config/product.rhelElsPayg.js
index 7556a1ead..da13cefd7 100644
--- a/src/config/product.rhelElsPayg.js
+++ b/src/config/product.rhelElsPayg.js
@@ -317,6 +317,10 @@ const config = {
       id: 'rangedMonthly',
       isSecondary: true,
       position: SelectPosition.right
+    },
+    {
+      id: 'export',
+      isItem: true
     }
   ]
 };
diff --git a/src/config/product.rhods.js b/src/config/product.rhods.js
index 7aa6bbaa6..9cc69a887 100644
--- a/src/config/product.rhods.js
+++ b/src/config/product.rhods.js
@@ -316,6 +316,10 @@ const config = {
       id: 'rangedMonthly',
       isSecondary: true,
       position: SelectPosition.right
+    },
+    {
+      id: 'export',
+      isItem: true
     }
   ]
 };
diff --git a/src/config/product.rosa.js b/src/config/product.rosa.js
index 8a069e3eb..ca0e385d2 100644
--- a/src/config/product.rosa.js
+++ b/src/config/product.rosa.js
@@ -358,6 +358,10 @@ const config = {
       id: 'rangedMonthly',
       isSecondary: true,
       position: SelectPosition.right
+    },
+    {
+      id: 'export',
+      isItem: true
     }
   ]
 };
diff --git a/src/config/product.satellite.js b/src/config/product.satellite.js
index d40a10209..c54278f31 100644
--- a/src/config/product.satellite.js
+++ b/src/config/product.satellite.js
@@ -276,6 +276,10 @@ const config = {
     },
     {
       id: RHSM_API_QUERY_SET_TYPES.CATEGORY
+    },
+    {
+      id: 'export',
+      isItem: true
     }
   ]
 };
diff --git a/src/redux/hooks/useReactRedux.js b/src/redux/hooks/useReactRedux.js
index ba0b93fea..02a8ffcce 100644
--- a/src/redux/hooks/useReactRedux.js
+++ b/src/redux/hooks/useReactRedux.js
@@ -121,10 +121,10 @@ const useSelectors = (
       idMultiSelectorResponse[id] = listMultiSelectorResponse[index];
     });
 
-    return idMultiSelectorResponse;
+    return idMultiSelectorResponse || {};
   }
 
-  return listMultiSelectorResponse;
+  return listMultiSelectorResponse || [];
 };
 
 /**
@@ -174,7 +174,7 @@ const useSelectorsResponse = (selectors, { useSelectors: useAliasSelectors = use
   updatedSelectorResponse.forEach(response => {
     const id = (!isSelectorResponseArray && response?.[0]) || null;
 
-    const updatedResponse = (isSelectorResponseArray && response) || response?.[1] || response;
+    const updatedResponse = (isSelectorResponseArray && response) || response?.[1] || response || {};
     const isServiceResponse =
       typeof updatedResponse.cancelled === 'boolean' ||
       typeof updatedResponse.error === 'boolean' ||
diff --git a/tests/__snapshots__/code.test.js.snap b/tests/__snapshots__/code.test.js.snap
index 9faa336f5..99403eea8 100644
--- a/tests/__snapshots__/code.test.js.snap
+++ b/tests/__snapshots__/code.test.js.snap
@@ -12,9 +12,10 @@ exports[`General code checks should only have specific console.[warn|log|info|er
   "services/common/helpers.js:105:    console.error(",
   "services/common/serviceConfig.js:155:          console.warn(normalizeError);",
   "services/common/serviceConfig.js:179:          console.warn(normalizeError);",
-  "services/common/serviceConfig.js:263:          console.error(err);",
-  "services/common/serviceConfig.js:277:            console.error(err);",
-  "services/common/serviceConfig.js:308:                console.error(err);",
+  "services/common/serviceConfig.js:277:          console.error(err);",
+  "services/common/serviceConfig.js:291:            console.error(err);",
   "services/common/serviceConfig.js:320:                console.error(err);",
+  "services/common/serviceConfig.js:336:                console.error(err);",
+  "services/common/serviceConfig.js:348:                console.error(err);",
 ]
 `;
diff --git a/tests/__snapshots__/dist.test.js.snap b/tests/__snapshots__/dist.test.js.snap
index 00a3d686f..3bc5230af 100644
--- a/tests/__snapshots__/dist.test.js.snap
+++ b/tests/__snapshots__/dist.test.js.snap
@@ -822,6 +822,7 @@ exports[`Build distribution should match a specific file output 1`] = `
   "./dist/js/8795*js",
   "./dist/js/8803*js",
   "./dist/js/8923*js",
+  "./dist/js/9006*js",
   "./dist/js/9026*js",
   "./dist/js/9067*js",
   "./dist/js/9205*js",
@@ -950,6 +951,7 @@ exports[`Build distribution should match a specific file output 1`] = `
   "./dist/sourcemaps/8795*map",
   "./dist/sourcemaps/8803*map",
   "./dist/sourcemaps/8923*map",
+  "./dist/sourcemaps/9006*map",
   "./dist/sourcemaps/9026*map",
   "./dist/sourcemaps/9205*map",
   "./dist/sourcemaps/9387*map",