Reduce dependence on Solr as a primary datasource

Â