Move Invite filtering to new class