Merge unified search on master, some deps version are wrong