partial reworking of fetch to datasource strategy