Bug fixing: Searcher Decorator & ClusterSet