[#39970349] Fix data source refactor (jasmine is still failing but app is functional)