Added guest filtering