Optimaize for solr