Regarding units in countries

I think it's a pain scrolling through that list and giving the units a specific country. :l So I was thinking that we could have a search bar and be able to click countries on the map to specify what countries units can be trained in easily.

1. A search bar for searching countries in the unique unit placement screen
2. Clicking countries to select which ones can train that specific unit and each country highlighting as you go along on the physical map itself.