Restore loading from solr Fixes #711