Add metadata to search results.
Bug fix for empty result sets.