diff --git a/__tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap b/__tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap
index 7592dfdac5..42f5d221de 100644
--- a/__tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap
+++ b/__tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap
@@ -82,18 +82,7 @@ exports[`Matches shallow shapshot 1`] = `
           clearable={false}
           id="community-select"
           onChange={[Function]}
-          options={
-            Array [
-              Object {
-                "data": <div>
-                  Sample community
-                </div>,
-                "label": "Sample community",
-                "name": "Sample community",
-                "value": "",
-              },
-            ]
-          }
+          options={Array []}
           selectRef={[Function]}
           simpleValue={true}
           value=""
@@ -278,18 +267,7 @@ exports[`Matches shallow shapshot 2`] = `
           clearable={false}
           id="community-select"
           onChange={[Function]}
-          options={
-            Array [
-              Object {
-                "data": <div>
-                  Sample community
-                </div>,
-                "label": "Sample community",
-                "name": "Sample community",
-                "value": "",
-              },
-            ]
-          }
+          options={Array []}
           selectRef={[Function]}
           simpleValue={true}
           value=""
diff --git a/src/server/tc-communities/blockchain/metadata.json b/src/server/tc-communities/blockchain/metadata.json
index fc2395d058..68d63343f2 100644
--- a/src/server/tc-communities/blockchain/metadata.json
+++ b/src/server/tc-communities/blockchain/metadata.json
@@ -1,13 +1,14 @@
 {
   "challengeFilter": {
-    "groups": ["blockchain"],
+    "groupIds": ["20000010"],
     "or": [{
       "tags": ["Blockchain", "Ethereum"]
     }]
   },
   "communityId": "blockchain",
+  "hidden": true,
   "communityName": "Blockchain Community",
-  "groups": ["blockchain"],
+  "groupIds": ["20000010"],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/blockchain/logo_topcoder_with_name.svg",
diff --git a/src/server/tc-communities/cognitive/metadata.json b/src/server/tc-communities/cognitive/metadata.json
index 3642fd9ee8..8426ae839d 100644
--- a/src/server/tc-communities/cognitive/metadata.json
+++ b/src/server/tc-communities/cognitive/metadata.json
@@ -1,6 +1,6 @@
 {
   "challengeFilter": {
-    "groups": ["cognitive"],
+    "groupIds": ["20000015"],
     "or": [{
       "tags": ["Cognitive", "IBM Cognitive", "IBM Watson"]
     }]
@@ -9,8 +9,9 @@
     "openChallengesInNewTabs": false
   },
   "communityId": "cognitive",
+  "hidden": true,
   "communityName": "Topcoder Cognitive Community",
-  "groups": ["cognitive"],
+  "groupIds": ["20000015"],
   "logos": [{
     "img": "/community-app-assets/themes/cognitive/logo_topcoder_with_name.svg",
     "url": "https://www.topcoder.com"
diff --git a/src/server/tc-communities/comcast/metadata.json b/src/server/tc-communities/comcast/metadata.json
index a941907c7b..d720d79895 100644
--- a/src/server/tc-communities/comcast/metadata.json
+++ b/src/server/tc-communities/comcast/metadata.json
@@ -1,16 +1,17 @@
 {
-  "authorizedGroups": [
-    "comcast"
+  "authorizedGroupIds": [
+    "20000867"
   ],
   "challengeFilter": {
-    "groups": ["comcast"],
+    "groupIds": ["20000867"],
     "or": [{
       "tags": ["Comcast"]
     }]
   },
   "communityId": "comcast",
+  "hidden": true,
   "communityName": "Comcast Community",
-  "groups": ["comcast"],
+  "groupIds": ["20000867"],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/comcast/corporate_Official-Comcast-Logo.png",
diff --git a/src/server/tc-communities/community-2/metadata.json b/src/server/tc-communities/community-2/metadata.json
index 4322902395..8f984ed536 100644
--- a/src/server/tc-communities/community-2/metadata.json
+++ b/src/server/tc-communities/community-2/metadata.json
@@ -1,10 +1,10 @@
 {
   "challengeFilter": {
-    "groups": ["community-2"]
+    "groupIds": ["20000002"]
   },
   "communityId": "community-2",
   "communityName": "Community 2",
-  "groups": ["community-2"],
+  "groupIds": ["20000002"],
   "hidden": true,
   "leaderboardApiUrl": "https://api.topcoder.com/v4/looks/458/run/json/",
   "logos": [{
diff --git a/src/server/tc-communities/cs/metadata.json b/src/server/tc-communities/cs/metadata.json
index 8663b9541c..83e27e9869 100644
--- a/src/server/tc-communities/cs/metadata.json
+++ b/src/server/tc-communities/cs/metadata.json
@@ -1,17 +1,18 @@
 {
-  "authorizedGroups": [
-    "cs"
+  "authorizedGroupIds": [
+    "20000044"
   ],
   "challengeFilter": {
-    "groups": ["cs"]
+    "groupIds": ["20000044"]
   },
   "challengeListing": {
     "ignoreCommunityFilterByDefault": true,
     "openChallengesInNewTabs": false
   },
   "communityId": "cs",
+  "hidden": true,
   "communityName": "CS Community",
-  "groups": ["cs"],
+  "groupIds": ["20000044"],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/cs/credit-suisse-logo.jpg",
diff --git a/src/server/tc-communities/demo-expert/metadata.json b/src/server/tc-communities/demo-expert/metadata.json
index 07213c2983..da1e7908c3 100644
--- a/src/server/tc-communities/demo-expert/metadata.json
+++ b/src/server/tc-communities/demo-expert/metadata.json
@@ -1,11 +1,11 @@
 {
   "challengeFilter": {
-    "groups": ["demo-expert"],
+    "groupIds": ["20000003"],
     "tags": [".NET"]
   },
   "communityId": "demo-expert",
   "communityName": "Demo Expert Community",
-  "groups": ["demo-expert"],
+  "groupIds": ["20000003"],
   "hidden": true,
   "logos": [{
     "img": "/community-app-assets/themes/demo-expert/logo_topcoder_with_name.svg",
diff --git a/src/server/tc-communities/iot/metadata.json b/src/server/tc-communities/iot/metadata.json
index 9038cafd42..861772151a 100644
--- a/src/server/tc-communities/iot/metadata.json
+++ b/src/server/tc-communities/iot/metadata.json
@@ -1,14 +1,15 @@
 {
-  "authorizedGroups": ["hide-challenges"],
+  "authorizedGroupIds": ["20000014"],
   "challengeFilter": {
-    "groups": ["iot"],
+    "groupIds": ["20000045"],
     "or": [{
       "tags": ["IoT", "Predix"]
     }]
   },
   "communityId": "iot",
+  "hidden": true,
   "communityName": "IoT Community",
-  "groups": ["iot"],
+  "groupIds": ["20000045"],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/iot/logo_topcoder_with_name.svg",
diff --git a/src/server/tc-communities/mobile/metadata.json b/src/server/tc-communities/mobile/metadata.json
index 5b8dbde5d1..3deb873401 100644
--- a/src/server/tc-communities/mobile/metadata.json
+++ b/src/server/tc-communities/mobile/metadata.json
@@ -1,7 +1,7 @@
 {
-  "authorizedGroups": ["hide-challenges"],
+  "authorizedGroupIds": ["20000014"],
   "challengeFilter": {
-    "groups": ["mobile"],
+    "groupIds": ["20000047"],
     "or": [{
       "tags": ["Mobile", "iOS", "Android"]
     }]
@@ -11,8 +11,9 @@
     "openChallengesInNewTabs": false
   },
   "communityId": "mobile",
+  "hidden": true,
   "communityName": "Mobile Community",
-  "groups": ["mobile"],
+  "groupIds": ["20000047"],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/mobile/logo_topcoder_with_name.svg",
diff --git a/src/server/tc-communities/qa/metadata.json b/src/server/tc-communities/qa/metadata.json
index 3812f6aafc..33f4be0826 100644
--- a/src/server/tc-communities/qa/metadata.json
+++ b/src/server/tc-communities/qa/metadata.json
@@ -1,14 +1,14 @@
 {
-  "authorizedGroups": ["hide-challenges"],
+  "authorizedGroupIds": ["20000014"],
   "challengeFilter": {
-    "groups": ["qa-public","wipro-qaas"],
+    "groupIds": ["20000012","20000004"],
     "or": [{
       "tags": ["QA"]
     }]
   },
   "communityId": "qa",
   "communityName": "QA Community",
-  "groups": ["qa-public","wipro-qaas"],
+  "groupIds": ["20000012","20000004"],
   "hidden": true,
   "logos": [{
     "img": "/community-app-assets/themes/qa/logo_topcoder_with_name.svg",
diff --git a/src/server/tc-communities/srmx/metadata.json b/src/server/tc-communities/srmx/metadata.json
index 2be167a878..6b712fc4b9 100644
--- a/src/server/tc-communities/srmx/metadata.json
+++ b/src/server/tc-communities/srmx/metadata.json
@@ -1,11 +1,11 @@
 {
-  "authorizedGroups": ["srmx"],
+  "authorizedGroupIds": ["20000006"],
   "challengeFilter": {
-    "groups": ["srmx"]
+    "groupIds": ["20000006"]
   },
   "communityId": "srmx",
   "communityName": "SRMX",
-  "groups": ["srmx"],
+  "groupIds": ["20000006"],
   "hidden": true,
   "logos": [{
     "img": "/community-app-assets/themes/srmx/logo_topcoder_with_name.svg",
diff --git a/src/server/tc-communities/taskforce/metadata.json b/src/server/tc-communities/taskforce/metadata.json
index fdac1b43a8..ffb55a42b8 100644
--- a/src/server/tc-communities/taskforce/metadata.json
+++ b/src/server/tc-communities/taskforce/metadata.json
@@ -1,13 +1,13 @@
 {
-  "authorizedGroups": [
-    "taskforce"
+  "authorizedGroupIds": [
+    "20000003"
   ],
   "challengeFilter": {
-    "groups": ["taskforce"]
+    "groupIds": ["20000003"]
   },
   "communityId": "taskforce",
   "communityName": "Taskforce",
-  "groups": ["taskforce"],
+  "groupIds": ["20000003"],
   "hidden": true,
   "leaderboardApiUrl": "https://api.topcoder.com/v4/looks/458/run/json/",
   "logos": [{
diff --git a/src/server/tc-communities/tc-prod-dev/metadata.json b/src/server/tc-communities/tc-prod-dev/metadata.json
index 6fae858413..6894bf1b91 100644
--- a/src/server/tc-communities/tc-prod-dev/metadata.json
+++ b/src/server/tc-communities/tc-prod-dev/metadata.json
@@ -1,10 +1,10 @@
 {
   "challengeFilter": {
-    "groups": ["tc-prod-dev"]
+    "groupIds": ["20000013"]
   },
   "communityId": "tc-prod-dev",
   "communityName": "Topcoder Product Development",
-  "groups": ["tc-prod-dev"],
+  "groupIds": ["20000013"],
   "hidden": true,
   "terms": [21193,21153],
   "logos": [{
diff --git a/src/server/tc-communities/tco01/metadata.json b/src/server/tc-communities/tco01/metadata.json
index 2992260e95..597b451b19 100644
--- a/src/server/tc-communities/tco01/metadata.json
+++ b/src/server/tc-communities/tco01/metadata.json
@@ -2,7 +2,7 @@
   "communityId": "tco01",
   "hidden": true,
   "communityName": "TCO01",
-  "groups": [],
+  "groupIds": [],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/tco/TCO01.svg",
diff --git a/src/server/tc-communities/tco02/metadata.json b/src/server/tc-communities/tco02/metadata.json
index 63929965c4..7db3acef58 100644
--- a/src/server/tc-communities/tco02/metadata.json
+++ b/src/server/tc-communities/tco02/metadata.json
@@ -2,7 +2,7 @@
   "communityId": "tco02",
   "hidden": true,
   "communityName": "TCO02",
-  "groups": [],
+  "groupIds": [],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/tco/TCO02.png",
diff --git a/src/server/tc-communities/tco03/metadata.json b/src/server/tc-communities/tco03/metadata.json
index 8018fa0e6f..9ef191434d 100644
--- a/src/server/tc-communities/tco03/metadata.json
+++ b/src/server/tc-communities/tco03/metadata.json
@@ -2,7 +2,7 @@
   "communityId": "tco03",
   "hidden": true,
   "communityName": "TCO03",
-  "groups": [],
+  "groupIds": [],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/tco/TCO03.png",
diff --git a/src/server/tc-communities/tco04/metadata.json b/src/server/tc-communities/tco04/metadata.json
index d73ee08c7c..92113c50fb 100644
--- a/src/server/tc-communities/tco04/metadata.json
+++ b/src/server/tc-communities/tco04/metadata.json
@@ -2,7 +2,7 @@
   "communityId": "tco04",
   "hidden": true,
   "communityName": "TCO04",
-  "groups": [],
+  "groupIds": [],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/tco/TCO04.png",
diff --git a/src/server/tc-communities/tco05/metadata.json b/src/server/tc-communities/tco05/metadata.json
index 7d8cfaa874..0473049df9 100644
--- a/src/server/tc-communities/tco05/metadata.json
+++ b/src/server/tc-communities/tco05/metadata.json
@@ -2,7 +2,7 @@
   "communityId": "tco05",
   "hidden": true,
   "communityName": "TCO05",
-  "groups": [],
+  "groupIds": [],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/tco/TCO05.png",
diff --git a/src/server/tc-communities/tco06/metadata.json b/src/server/tc-communities/tco06/metadata.json
index 9d0f08d866..c413f78170 100644
--- a/src/server/tc-communities/tco06/metadata.json
+++ b/src/server/tc-communities/tco06/metadata.json
@@ -2,7 +2,7 @@
   "communityId": "tco06",
   "hidden": true,
   "communityName": "TCO06",
-  "groups": [],
+  "groupIds": [],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/tco/TCO06.png",
diff --git a/src/server/tc-communities/tco07/metadata.json b/src/server/tc-communities/tco07/metadata.json
index 086e764b27..8e09186a7d 100644
--- a/src/server/tc-communities/tco07/metadata.json
+++ b/src/server/tc-communities/tco07/metadata.json
@@ -2,7 +2,7 @@
   "communityId": "tco07",
   "hidden": true,
   "communityName": "TCO07",
-  "groups": [],
+  "groupIds": [],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/tco/TCO07.png",
diff --git a/src/server/tc-communities/tco08/metadata.json b/src/server/tc-communities/tco08/metadata.json
index 7f4f469219..dad22ab170 100644
--- a/src/server/tc-communities/tco08/metadata.json
+++ b/src/server/tc-communities/tco08/metadata.json
@@ -2,7 +2,7 @@
   "communityId": "tco08",
   "hidden": true,
   "communityName": "TCO08",
-  "groups": [],
+  "groupIds": [],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/tco/TCO08.png",
diff --git a/src/server/tc-communities/tco09/metadata.json b/src/server/tc-communities/tco09/metadata.json
index 39af9aee78..e3fdcd1f28 100644
--- a/src/server/tc-communities/tco09/metadata.json
+++ b/src/server/tc-communities/tco09/metadata.json
@@ -2,7 +2,7 @@
   "communityId": "tco09",
   "hidden": true,
   "communityName": "TCO09",
-  "groups": [],
+  "groupIds": [],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/tco/TCO09.png",
diff --git a/src/server/tc-communities/tco10/metadata.json b/src/server/tc-communities/tco10/metadata.json
index 936076b996..c59c366708 100644
--- a/src/server/tc-communities/tco10/metadata.json
+++ b/src/server/tc-communities/tco10/metadata.json
@@ -2,7 +2,7 @@
   "communityId": "tco10",
   "hidden": true,
   "communityName": "TCO10",
-  "groups": [],
+  "groupIds": [],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/tco/TCO10.png",
diff --git a/src/server/tc-communities/tco11/metadata.json b/src/server/tc-communities/tco11/metadata.json
index f5660e8e03..5344934923 100644
--- a/src/server/tc-communities/tco11/metadata.json
+++ b/src/server/tc-communities/tco11/metadata.json
@@ -2,7 +2,7 @@
   "communityId": "tco11",
   "hidden": true,
   "communityName": "TCO11",
-  "groups": [],
+  "groupIds": [],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/tco/TCO11.png",
diff --git a/src/server/tc-communities/tco12/metadata.json b/src/server/tc-communities/tco12/metadata.json
index 27f722eac2..be226cb7c0 100644
--- a/src/server/tc-communities/tco12/metadata.json
+++ b/src/server/tc-communities/tco12/metadata.json
@@ -2,7 +2,7 @@
   "communityId": "tco12",
   "hidden": true,
   "communityName": "TCO12",
-  "groups": [],
+  "groupIds": [],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/tco/TCO12.svg",
diff --git a/src/server/tc-communities/tco13/metadata.json b/src/server/tc-communities/tco13/metadata.json
index d37e26a29f..9fc7c1390d 100644
--- a/src/server/tc-communities/tco13/metadata.json
+++ b/src/server/tc-communities/tco13/metadata.json
@@ -2,7 +2,7 @@
   "communityId": "tco13",
   "hidden": true,
   "communityName": "TCO13",
-  "groups": [],
+  "groupIds": [],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/tco/TCO13.svg",
diff --git a/src/server/tc-communities/tco14/metadata.json b/src/server/tc-communities/tco14/metadata.json
index 56c007476b..2d2c7f0019 100644
--- a/src/server/tc-communities/tco14/metadata.json
+++ b/src/server/tc-communities/tco14/metadata.json
@@ -2,7 +2,7 @@
   "communityId": "tco14",
   "hidden": true,
   "communityName": "TCO14",
-  "groups": [],
+  "groupIds": [],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/tco/TCO14.svg",
diff --git a/src/server/tc-communities/tco15/metadata.json b/src/server/tc-communities/tco15/metadata.json
index c476758880..8cffaa44f2 100644
--- a/src/server/tc-communities/tco15/metadata.json
+++ b/src/server/tc-communities/tco15/metadata.json
@@ -2,7 +2,7 @@
   "communityId": "tco15",
   "hidden": true,
   "communityName": "TCO15",
-  "groups": [],
+  "groupIds": [],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/tco/TCO15.svg",
diff --git a/src/server/tc-communities/tco16/metadata.json b/src/server/tc-communities/tco16/metadata.json
index 51af6702be..e8662ef0aa 100644
--- a/src/server/tc-communities/tco16/metadata.json
+++ b/src/server/tc-communities/tco16/metadata.json
@@ -2,7 +2,7 @@
   "communityId": "tco16",
   "hidden": true,
   "communityName": "TCO16",
-  "groups": [],
+  "groupIds": [],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/tco/TCO16.svg",
diff --git a/src/server/tc-communities/tco17/metadata.json b/src/server/tc-communities/tco17/metadata.json
index 768e568890..7cee5b3239 100644
--- a/src/server/tc-communities/tco17/metadata.json
+++ b/src/server/tc-communities/tco17/metadata.json
@@ -2,7 +2,7 @@
   "communityId": "tco17",
   "hidden": true,
   "communityName": "TCO17",
-  "groups": [],
+  "groupIds": [],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/tco/TCO17.svg",
diff --git a/src/server/tc-communities/tco18/metadata.json b/src/server/tc-communities/tco18/metadata.json
index 239c14e7df..6464b4dc13 100644
--- a/src/server/tc-communities/tco18/metadata.json
+++ b/src/server/tc-communities/tco18/metadata.json
@@ -2,7 +2,7 @@
   "communityId": "tco18",
   "hidden": true,
   "communityName": "TCO18",
-  "groups": [],
+  "groupIds": [],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/tco/TCO18.svg",
diff --git a/src/server/tc-communities/tco19/metadata.json b/src/server/tc-communities/tco19/metadata.json
index bfec431932..d3e84c70ea 100644
--- a/src/server/tc-communities/tco19/metadata.json
+++ b/src/server/tc-communities/tco19/metadata.json
@@ -1,13 +1,10 @@
 {
   "challengeFilter": {
-    "groups": ["tco-parent"],
-    "or": [{
-      "tags": ["TCO", "TCO19"]
-    }]
+    "events": ["tco19"]
   },
   "communityId": "tco19",
   "communityName": "TCO19",
-  "groups": ["tco-parent"],
+  "groupIds": ["20000078"],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/tco/TCO19.svg",
diff --git a/src/server/tc-communities/tco20/metadata.json b/src/server/tc-communities/tco20/metadata.json
index 29a1cb3fa2..37fc87ff70 100644
--- a/src/server/tc-communities/tco20/metadata.json
+++ b/src/server/tc-communities/tco20/metadata.json
@@ -3,8 +3,9 @@
     "events": ["tco20"]
   },
   "communityId": "tco20",
+  "hidden": true,
   "communityName": "TCO20",
-  "groups": [],
+  "groupIds": [],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/tco/TCO20.svg",
diff --git a/src/server/tc-communities/tco21/metadata.json b/src/server/tc-communities/tco21/metadata.json
index 899665018e..1728e49c05 100644
--- a/src/server/tc-communities/tco21/metadata.json
+++ b/src/server/tc-communities/tco21/metadata.json
@@ -3,8 +3,9 @@
     "events": ["tco21"]
   },
   "communityId": "tco21",
+  "hidden": true,
   "communityName": "TCO21",
-  "groups": [],
+  "groupIds": [],
   "hideSearch": true,
   "logos": [{
     "img": "/community-app-assets/themes/tco/TCO21.svg",
diff --git a/src/server/tc-communities/veterans/metadata.json b/src/server/tc-communities/veterans/metadata.json
index cc8c7a2bc3..fa874ae822 100644
--- a/src/server/tc-communities/veterans/metadata.json
+++ b/src/server/tc-communities/veterans/metadata.json
@@ -1,13 +1,14 @@
 {
   "challengeFilter": {
-    "groups": ["veterans"]
+    "groupIds": ["20000013"]
   },
   "challengeListing": {
     "ignoreCommunityFilterByDefault": true
   },
   "communityId": "veterans",
+  "hidden": true,
   "communityName": "Veterans Community",
-  "groups": ["veterans"],
+  "groupIds": ["20000013"],
   "terms": [21193, 21263],
   "logos": [{
     "img": "/community-app-assets/themes/veterans/logo_topcoder_with_name.svg",
diff --git a/src/server/tc-communities/wipro/metadata.json b/src/server/tc-communities/wipro/metadata.json
index 4625906d9f..10bc16b62f 100644
--- a/src/server/tc-communities/wipro/metadata.json
+++ b/src/server/tc-communities/wipro/metadata.json
@@ -1,17 +1,18 @@
 {
-  "authorizedGroups": [
-    "wipro", "wipro-holmes", "wipro-topgear-capital-one-tg-captialone-map-migration", "wipro-future-employees"
+  "authorizedGroupIds": [
+    "20000000", "20000005", "20000011", "20000016"
   ],
   "challengeFilter": {
-    "groups": ["wipro"]
+    "groupIds": ["20000000"]
   },
   "challengeListing": {
     "ignoreCommunityFilterByDefault": true,
     "openChallengesInNewTabs": false
   },
   "communityId": "wipro",
+  "hidden": true,
   "communityName": "TopGear Community",
-  "groups": ["wipro"],
+  "groupIds": ["20000000"],
   "leaderboardApiUrl": "https://api.topcoder.com/v4/looks/458/run/json/",
   "logos": [{
     "img": "/community-app-assets/themes/wipro/wipro-logo.png",
diff --git a/src/server/tc-communities/zurich/metadata.json b/src/server/tc-communities/zurich/metadata.json
index 05df90b58b..b5f65656b1 100644
--- a/src/server/tc-communities/zurich/metadata.json
+++ b/src/server/tc-communities/zurich/metadata.json
@@ -1,17 +1,18 @@
 {
-  "authorizedGroups": [
-    "zurich"
+  "authorizedGroupIds": [
+    "20000145"
   ],
   "challengeFilter": {
-    "groups": ["zurich"]
+    "groupIds": ["20000145"]
   },
   "challengeListing": {
     "ignoreCommunityFilterByDefault": false,
     "openChallengesInNewTabs": false
   },
   "communityId": "zurich",
+  "hidden": true,
   "communityName": "Zurich Community",
-  "groups": ["zurich"],
+  "groupIds": ["20000145"],
   "authorizedGroupIdsCatalog": ["c40767a9-e02e-4872-87eb-d50dcb946055", "a1bcb865-7235-481f-ae62-b82dd958fc4c"],
   "competitorsGroupIds": ["20000226"],
   "logos": [{
diff --git a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
index e203cbb912..8c36d666fd 100644
--- a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
+++ b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
@@ -180,10 +180,12 @@ export default function FiltersPanel({
     );
   };
 
-  const communityOps = communityFilters.filter(community => !community.hidden)
+  const communityOps = communityFilters.filter(community => (
+    !community.hidden && community.groupIds && community.groupIds.length > 0
+  ))
     .map(community => ({
       label: community.communityName,
-      value: community.groupIds && community.groupIds.length > 0 ? community.groupIds[0] : '',
+      value: community.groupIds[0],
       name: community.communityName,
       data: getLabel(community),
     }));
@@ -242,8 +244,9 @@ export default function FiltersPanel({
               id="community-select"
               // onChange={selectCommunity}
               onChange={(value) => {
-                const group = value;
-                setFilterState({ ..._.clone(filterState), groups: group === '' ? [] : [group] });
+                // const group = value;
+                // setFilterState({ ..._.clone(filterState), groups: group === '' ? [] : [group] });
+                setFilterState({ ..._.clone(filterState), groups: [value] });
               }}
               options={communityOps}
               simpleValue