Refactoring continues. CountryProvider has working Search on 4 maps.