Occurrence search classes modified to use the latest API changes