Merge "Fixing some search box issues."