Email send search slimmed down and fixed