TEIID-2491 fixing parsing workarounds