Revert "Revert "Optimization for solr facets""

This reverts commit 71265e2906306e0d3013c4434e9efe056b30e8c7.