Improved search results

Now returns new fields in the search results