diff --git a/advlabdb/adminModelViews.py b/advlabdb/adminModelViews.py
index 23f595a..39d2dd2 100644
--- a/advlabdb/adminModelViews.py
+++ b/advlabdb/adminModelViews.py
@@ -568,7 +568,7 @@ class PartStudentView(SecureAdminModelView):
 
 
 def partStudentQueryFactory():
-    return PartStudent.query.filter(PartStudent.part.has(Part.semester == current_user.active_semester))
+    return PartStudent.query.join(Part).where(Part.semester == current_user.active_semester)
 
 
 class ProgramRowFilter(FilterEqual):
@@ -589,12 +589,12 @@ class GroupView(SecureAdminModelView):
         if is_created:
 
             def query_factory():
-                return partStudentQueryFactory().filter(PartStudent.group == None)
+                return partStudentQueryFactory().where(PartStudent.group == None)
 
         else:
 
             def query_factory():
-                return partStudentQueryFactory().filter(
+                return partStudentQueryFactory().where(
                     or_(
                         and_(PartStudent.group == None, PartStudent.part.has(Part.program == group.program)),
                         PartStudent.group == group,