fixes some minor issue, added search for email address