Soft credit appearance inconsistent in contribution search

If contribution search is run with "Contribution Only" criteria, and then switched to "Both," soft credits appear as gifts and are missing soft credit data.

Tested on live site on Drupal and Drupal demo site.

HOW TO REPRODUCE:

1. Go to "Contributions" > "Find Contributions"
2. Run search with all options default. Soft credit data will not appear.
3. Under "Edit Search Criteria," change "Contributions OR Soft Credits?" from "Contributions Only" to "Both"
4. Soft credit data should now appear but does not.
5. Run search again without changing criteria.
6. Soft credit data now appears.