Feature/server to solr server relations