I use icloud also and concur. Search in Apple Mail is poor.