Search separated from tools
Search fully working