More refactoring: reowk of SolrProxy,SolrGazetteer and PlaceNameMatcher