Make treaty and country L2 uniform