Added search results pages
Resolved merge conflict