search, minor changes