added search; added # entries