Restore legacy search functionality
Fixed search view test.
Merge pull request #2 from jezdez/search-legacy-format

Fixed search view test.
Merge pull request #1643 from darkwing/search-legacy-format

Restore legacy search functionality