Improvements to POIs import config

unified queries in one file, datasource differences extracted to
solrconfig.xml file. Also added comments to each import query to show
what is imported.