diff --git a/public/index.html b/public/index.html
index 74daf833a..a5a3e4fc2 100644
--- a/public/index.html
+++ b/public/index.html
@@ -299,7 +299,7 @@
       attachmentsEnabled: true,
       showNodeLabel: true,
       mutable: true,
-      filters: ['whatsapp', 'classifier', 'ticketer', 'optins'],
+      filters: ['whatsapp', 'classifier', 'ticketer', 'optins', 'groups'],
 
       excludeTypes: [
         'add_contact_urn',
@@ -351,7 +351,7 @@
         globals: base + 'globals',
         groups: base + 'groups',
         fields: base + 'fields?scope=contact',
-        waGroupFields: base + 'fields?scope=group',
+        waGroupFields: base + 'fields?scope=wa_group',
         labels: base + 'labels',
         optins: base + 'optins',
         channels: base + 'channels',
diff --git a/src/external/index.ts b/src/external/index.ts
index e2ca2110d..32172a3ec 100644
--- a/src/external/index.ts
+++ b/src/external/index.ts
@@ -306,12 +306,12 @@ export const createAssetStore = (endpoints: Endpoints): Promise<AssetStore> => {
         id: 'key',
         items: {}
       },
-      // waGroupFields: {
-      //   endpoint: getURL(endpoints.waGroupFields),
-      //   type: AssetType.Field,
-      //   id: 'key',
-      //   items: {}
-      // },
+      waGroupFields: {
+        endpoint: getURL(endpoints.waGroupFields),
+        type: AssetType.Field,
+        id: 'key',
+        items: {}
+      },
       globals: {
         endpoint: getURL(endpoints.globals),
         type: AssetType.Global,
diff --git a/src/flowTypes.ts b/src/flowTypes.ts
index 73e5aaff4..00b55aea4 100644
--- a/src/flowTypes.ts
+++ b/src/flowTypes.ts
@@ -27,7 +27,7 @@ export interface Endpoints {
   resthooks: string;
   recents: string;
   fields: string;
-  // waGroupFields: string;
+  waGroupFields: string;
   globals: string;
   groups: string;
   recipients: string;
diff --git a/src/test/config.ts b/src/test/config.ts
index 1e897255b..84a70e0b3 100644
--- a/src/test/config.ts
+++ b/src/test/config.ts
@@ -26,7 +26,7 @@ const config: FlowEditorConfig = {
     globals: '/assets/globals.json',
     groups: '/assets/groups.json',
     fields: '/assets/fields.json',
-    // waGroupFields: '/assets/fields.json',
+    waGroupFields: '/assets/fields.json',
     recipients: '/assets/recipients.json',
     contacts: '/assets/recipients.json',
     labels: '/assets/labels.json',
diff --git a/src/test/utils.tsx b/src/test/utils.tsx
index 1e7ee2bca..1de0c529e 100644
--- a/src/test/utils.tsx
+++ b/src/test/utils.tsx
@@ -34,7 +34,7 @@ export const TEST_DEFINITION: FlowDefinition = {
 export const EMPTY_TEST_ASSETS = {
   channels: { items: {}, type: AssetType.Channel },
   fields: { items: {}, type: AssetType.Field },
-  // waGroupFields: { items: {}, type: AssetType.Field },
+  waGroupFields: { items: {}, type: AssetType.Field },
   languages: { items: {}, type: AssetType.Language },
   labels: { items: {}, type: AssetType.Label },
   results: { items: {}, type: AssetType.Result },
diff --git a/src/testUtils/assetCreators.ts b/src/testUtils/assetCreators.ts
index 47ba0633c..29b311dae 100644
--- a/src/testUtils/assetCreators.ts
+++ b/src/testUtils/assetCreators.ts
@@ -475,7 +475,7 @@ export const getActionFormProps = (action: AnyAction): ActionFormProps => ({
   assetStore: {
     channels: { items: {}, type: AssetType.Channel },
     fields: { items: {}, type: AssetType.Field },
-    // waGroupFields: { items: {}, type: AssetType.Field },
+    waGroupFields: { items: {}, type: AssetType.Field },
     languages: { items: {}, type: AssetType.Language },
     labels: { items: {}, type: AssetType.Label },
     results: { items: {}, type: AssetType.Result },