Optimized search results for new Solr schema