Huge refactoring. Subject extraction filter for solr