Fix Solr bug when system is not configured with a given searchable field type for a field
Remove defunct orm file reference