Added better search with solr, and sunspot