Improved filtering for class admin