Data and dataset dashboard, fix some scoped variables.