improve dni validator behaviour