Fix a number of search issues

R=efortuna@google.com

Review URL: https://chromiumcodereview.appspot.com//59613006