Search Working for real this time