fix issue in search disovery
merge from remote