PRD-4984 - Fixing datasource behaviour when editing multiple queries