Change to support school searching