added more search criteria