Refactoring / updated method formatting OxPoints ID
Handle case of relation when not primary site
Solr / attempt to improve performance by indexing larger batches
Merge branch 'index-shapes' into oxpoints-improvements

* index-shapes:
  Solr / attempt to improve performance by indexing larger batches