localized entities, validate code fix