solr changes with articles, refactoring