Enchancements to data-source-dropdown