Fix full validation with oneOf