updated search page
merge