Bug 1033000 - Fix Yahoo search codes r=rnewman