TEIID-2693 correcting and refining