update search page
Resolved merge conflict.