fixes to CustomToggle for added datasource types