PRD-4249: handle multi-select of datasource