fixed validation code generation
fixed cpu execution plan mapping