Make search load canonical URLs

Change-Id: I5cf0480340e6bf59119e726e0d7545c26e3ae8e4
Merge "Make search load canonical URLs"