fixing issues caused by datashift populator refactoring