Clean up and fix solr response parsing