Adapted to new search form