add multithread metaphor searcher, various renamings