am dc67b1c2: Merge "Fixing some search box issues."

* commit 'dc67b1c2444a8cbd42029570847189387fcfa606':
  Fixing some search box issues.