diff --git a/src/components/map/MapTiles.js b/src/components/map/MapTiles.js
index b361782..9c815b2 100644
--- a/src/components/map/MapTiles.js
+++ b/src/components/map/MapTiles.js
@@ -46,7 +46,6 @@ function MapTiles({
     const selectedMapStates = itemsFromGroups(
       selectedGroups,
       mapStates,
-      true,
       "mapId"
     );
 
diff --git a/src/helpers/select.js b/src/helpers/select.js
index 9551008..4b577d5 100644
--- a/src/helpers/select.js
+++ b/src/helpers/select.js
@@ -144,23 +144,26 @@ export function groupsFromIds(groupIds, groups) {
   return filteredGroups;
 }
 
-export function itemsFromGroups(
-  groups,
-  allItems,
-  includeGroupedItems = true,
-  itemKey = "id"
-) {
+function getGroupItems(group) {
+  if (group.type === "group") {
+    let groups = [];
+    for (let item of group.items) {
+      groups.push(...getGroupItems(item));
+    }
+    return groups;
+  } else {
+    return [group];
+  }
+}
+
+export function itemsFromGroups(groups, allItems, itemKey = "id") {
   const allItemsById = keyBy(allItems, itemKey);
   const groupedItems = [];
 
   for (let group of groups) {
-    if (group.type === "item") {
-      groupedItems.push(allItemsById[group.id]);
-    } else if (group.type === "group" && includeGroupedItems) {
-      for (let item of group.items) {
-        groupedItems.push(allItemsById[item.id]);
-      }
-    }
+    const groupItems = getGroupItems(group);
+    const items = groupItems.map((item) => allItemsById[item.id]);
+    groupedItems.push(...items);
   }
 
   return groupedItems;