fix deprecations; include datasets from loaded extensions