Add fix for school names if none is given