fix search
merge