updated search page
Fixed merge conflict