removes annex schools from query and cleaned up chart js rendering