Reduce amount of data requested from Solr and fix aggregation.
Merge pull request #55 from adam-vessey/7.x-LBL-61

Reduce amount of data requested from Solr and fix aggregation.