Add more location fields for Solr indexing.
Merge branch 'test' into staging