Better fix for school search