Cleaned up and fixed bug with overriding the country selection in backend