use solr for querying, and other enhancements #10288