Fixed returning of aggregations with search results.
Added annotation to remove nulls from JSON output.