merge from search page change