Issue #2191343 by jhodgdon: Improve Solr integration in the API search sub-module