diff --git a/ucs-school-umc-groups/umc/python/schoolgroups/__init__.py b/ucs-school-umc-groups/umc/python/schoolgroups/__init__.py
index 6016fae..31a7219 100644
--- a/ucs-school-umc-groups/umc/python/schoolgroups/__init__.py
+++ b/ucs-school-umc-groups/umc/python/schoolgroups/__init__.py
@@ -92,12 +92,8 @@ class Instance(SchoolBaseModule):
 	)
 	@LDAP_Connection()
 	def query(self, request, ldap_user_read=None, ldap_position=None):
-		klasses = [get_group_class(request)]
-		if klasses[0] is Teacher:
-			klasses.append(TeachersAndStaff)
-		groups = []
-		for klass in klasses:
-			groups.extend(klass.get_all(ldap_user_read, request.options['school'], filter_str=request.options['pattern'], easy_filter=True))
+		klass = get_group_class(request)
+		groups = klass.get_all(ldap_user_read, request.options['school'], filter_str=request.options['pattern'], easy_filter=True)
 		self.finished(request.id, [group.to_dict() for group in groups])
 
 	@sanitize(StringSanitizer(required=True))