more review work, search fixes