Modified search to return separate categories of results.