diff --git a/epdb/logic.py b/epdb/logic.py
index ec7db334..9b0b6213 100644
--- a/epdb/logic.py
+++ b/epdb/logic.py
@@ -265,7 +265,7 @@ class GroupManager(object):
     @transaction.atomic
     def update_members(caller: User, group: Group, member: Union[User, Group], add_or_remove: str):
 
-        if caller != group.owner:
+        if caller != group.owner and not caller.is_superuser:
             raise ValueError('Only the group Owner is allowed to add members!')
 
         if isinstance(member, Group):
diff --git a/epdb/models.py b/epdb/models.py
index 7202474d..5dde2e82 100644
--- a/epdb/models.py
+++ b/epdb/models.py
@@ -181,7 +181,7 @@ class Group(TimeStampedModel):
     public = models.BooleanField(verbose_name='Public Group', default=False)
     description = models.TextField(blank=False, null=False, verbose_name='Descriptions', default='no description')
     user_member = models.ManyToManyField("User", verbose_name='User members', related_name='users_in_group')
-    group_member = models.ManyToManyField("Group", verbose_name='Group member', related_name='groups_in_group')
+    group_member = models.ManyToManyField("Group", verbose_name='Group member', related_name='groups_in_group', blank=True)
 
     def __str__(self):
         return f"{self.name} (pk={self.pk})"
diff --git a/templates/collections/objects_list.html b/templates/collections/objects_list.html
index 6a745294..9a39caaa 100644
--- a/templates/collections/objects_list.html
+++ b/templates/collections/objects_list.html
@@ -258,44 +258,48 @@
             height: auto;
         }
     </style>
-    {% if object_type != 'package' %}
-        <div id="load-all-loading" class="spinner-widget">
-            <img id="loading-gif" src="{% static '/images/wait.gif' %}" alt="Loading...">
-        </div>
-    {% endif %}
+
+    <div id="load-all-loading" class="spinner-widget" style="display: none">
+        <img id="loading-gif" src="{% static '/images/wait.gif' %}" alt="Loading...">
+    </div>
+
 </div>
     <script>
         $(function () {
 
             $('#object-search').show();
 
-            {% if object_type != 'package' %}
-                setTimeout(function () {
-                    $('#load-all-error').hide();
+            {% if object_type != 'package' and object_type != 'user' and object_type != 'group' %}
+                {% if reviewed_objects|length > 50 or unreviewed_objects|length > 50 %}
+                    $('#load-all-loading').show()
 
-                    $.getJSON('?all=true', function (resp) {
-                        $('#ReviewedContent').empty();
-                        $('#UnreviewedContent').empty();
+                    setTimeout(function () {
+                        $('#load-all-error').hide();
 
-                        for (o in resp.objects) {
-                            obj = resp.objects[o];
-                            if (obj.reviewed) {
-                                $('#ReviewedContent').append('<a class="list-group-item" href="' + obj.url + '">' + obj.name + ' <span class="glyphicon glyphicon-star" aria-hidden="true" style="float:right" data-toggle="tooltip" data-placement="top" title="" data-original-title="Reviewed"></span></a>');
-                            } else {
-                                $('#UnreviewedContent').append('<a class="list-group-item" href="' + obj.url + '">' + obj.name + '</a>');
+                        $.getJSON('?all=true', function (resp) {
+                            $('#ReviewedContent').empty();
+                            $('#UnreviewedContent').empty();
+
+                            for (o in resp.objects) {
+                                obj = resp.objects[o];
+                                if (obj.reviewed) {
+                                    $('#ReviewedContent').append('<a class="list-group-item" href="' + obj.url + '">' + obj.name + ' <span class="glyphicon glyphicon-star" aria-hidden="true" style="float:right" data-toggle="tooltip" data-placement="top" title="" data-original-title="Reviewed"></span></a>');
+                                } else {
+                                    $('#UnreviewedContent').append('<a class="list-group-item" href="' + obj.url + '">' + obj.name + '</a>');
+                                }
                             }
-                        }
 
-                        $('#load-all-loading').hide();
-                        $('#load-remaining').hide();
-                    }).fail(function (resp) {
-                        $('#load-all-loading').hide();
-                        $('#load-all-error').show();
-                    });
+                            $('#load-all-loading').hide();
+                            $('#load-remaining').hide();
+                        }).fail(function (resp) {
+                            $('#load-all-loading').hide();
+                            $('#load-all-error').show();
+                        });
 
-                }, 2500);
+                    }, 2500);
+                {% endif %}
             {% endif %}
-
+        
             $('#modal-form-delete-submit').on('click', function (e) {
                 e.preventDefault();
                 $('#modal-form-delete').submit();