Corrected search criteria issues