added filtering logic for school