diff --git a/portal/src/main/java/org/eclipsefoundation/membership/portal/service/WorkingGroupsService.java b/portal/src/main/java/org/eclipsefoundation/membership/portal/service/WorkingGroupsService.java
index d9382a932615c1db6581cc78332528bdd6b17d1f..c4ef5c8ec944509310ff10fc0c138bcb45a12f45 100644
--- a/portal/src/main/java/org/eclipsefoundation/membership/portal/service/WorkingGroupsService.java
+++ b/portal/src/main/java/org/eclipsefoundation/membership/portal/service/WorkingGroupsService.java
@@ -13,7 +13,6 @@ package org.eclipsefoundation.membership.portal.service;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.eclipsefoundation.membership.portal.model.WorkingGroupMap.WorkingGroup;
 
@@ -33,7 +32,7 @@ public interface WorkingGroupsService {
      * @param projectStatus optional, statuses to include in result set
      * @return set of working groups matching optional filters if present, otherwise all available working groups
      */
-    public Set<WorkingGroup> get(String parentOrganization, List<String> projectStatus);
+    public List<WorkingGroup> get(String parentOrganization, List<String> projectStatus);
 
     public WorkingGroup getByName(String name);
 
diff --git a/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/DefaultInterestGroupService.java b/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/DefaultInterestGroupService.java
index 3a735981c82ea66f361650b8ee86a03f4d9bea2b..5126c3759105fe259e0668f28c33624fbadc4557 100644
--- a/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/DefaultInterestGroupService.java
+++ b/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/DefaultInterestGroupService.java
@@ -117,6 +117,7 @@ public class DefaultInterestGroupService implements InterestGroupService {
         List<User> igUsers = ig.get().getLeads();
         igUsers.addAll(ig.get().getParticipants());
         List<String> usernames = igUsers.stream().map(User::getUsername).distinct().collect(Collectors.toList());
+        LOGGER.debug("Looking up users in relation to IG {}: {}", igId, usernames);
         // batch requests, reduce, deduplicate, and augment data before returning
         return Lists
                 .partition(usernames, 25)
diff --git a/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/DefaultWorkingGroupsService.java b/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/DefaultWorkingGroupsService.java
index afaec1fb293f96b5d4d116344d30785e8c68b953..b67241dc816e4a68ce33d8598bad605d792c21d5 100644
--- a/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/DefaultWorkingGroupsService.java
+++ b/portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/DefaultWorkingGroupsService.java
@@ -15,11 +15,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 import javax.annotation.PostConstruct;
@@ -76,8 +74,8 @@ public class DefaultWorkingGroupsService implements WorkingGroupsService {
     }
 
     @Override
-    public Set<WorkingGroup> get(String parentOrganization, List<String> projectStatuses) {
-        return new HashSet<>(
+    public List<WorkingGroup> get(String parentOrganization, List<String> projectStatuses) {
+        return new ArrayList<>(
                 wgs.entrySet().stream().filter(e -> filterByParentOrganization(parentOrganization, e.getValue()))
                         .filter(e -> filterByProjectStatuses(projectStatuses, e.getValue()))
                         .collect(Collectors.toMap(Entry::getKey, Entry::getValue)).values());
diff --git a/src/main/k8s/production.yml b/src/main/k8s/production.yml
index bf73860b0d3609c45f31ea4e6f2026a4d9655a3e..eaa65cb624f4eaa9eabe7a2d7647ef3e4b4b7379 100644
--- a/src/main/k8s/production.yml
+++ b/src/main/k8s/production.yml
@@ -11,7 +11,7 @@ spec:
     matchLabels:
       app: eclipsefdn-react-membership
       environment: production
-  replicas: 2
+  replicas: 1
   template:
     metadata:
       labels: