BZ-8668 minor fixes(datasource Fix)