Code refactor
Reindex
Avoid solr on production