I think to make things simple with the forgotten countries, we are just including the country itself and not individual services. For example if you do USAF, USN, USMC etc, then you might as well do the same for Russia, who have VVS, PVO etc. As you can see, you very quickly add in many multiples of services for the same country and things get complex, not just for the user but for the poor man coding it! Keeping it to nationalities is the best way forward.