More work on listen/search.