Bug 950868 - Prevent failures when search terms return no results. Fix inconsistencies.
0.1.31