diff --git a/lib/entity_collection.class.dart b/lib/entity_collection.class.dart
index 263c89c..6fb7ef1 100644
--- a/lib/entity_collection.class.dart
+++ b/lib/entity_collection.class.dart
@@ -126,7 +126,7 @@ class EntityCollection {
     List<Entity> groups = [];
     List<Entity> nonGroupEntities = [];
     _allEntities.forEach((id, entity){
-      if ((id.indexOf("group.") == 0) && (id.indexOf(".all_") == -1) && (!entity.isView)) {
+      if (entity.isGroup && (entity.attributes['auto'] == null || !entity.attributes['auto']) && (!entity.isView)) {
         groups.add(entity);
       }
       if (!entity.isGroup) {