Added school-filter, added search-field