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

...nconsistencies.