Fix of really fix UNKNOWN-CTE handling
raoulbhatia: Custom changes