feat(mixed data source queries): lots of minor polish to new mixed data source and all the changes it has required, #436
