More solr search and index changes