Solr included, some view changes