Fix validation steps for all types but String and StringSet