issue #28: 3 bugfixes datasource