fixed an issue on missing national ids