added search and cluster mode