Minor changes in AddCountryFieldSubscriber