Changed query for School level count