Country Zone and Store/settings fixes