refactor on datasource page without harvester functionality for now