Add more crosstab options to demo data sources