Fixed spacing
Move dependent solr code into separate, albeit hacky, method