GBE-438: Use dataSource in shapefile uploader too