Rework solr queries on homepage/search page