TEIID-2591 ensuring projection is always corrected for system queries