TEIID-2669 additional changes to ensure proper empty set handling