ref #8294 Swap showIdInSource and ShowIdNamespace
ref #8294 Move supplemental data source preferences to sub menu