Search Fixes and Solr update.