Fixed to not require solr, even though it isn't nearly as cool