add some titles and fix data sources with keys
fix the rest of the data sources with keys