Added ugrad school and fixed criteria prefix bug