Country/State shortcode list improvement for Payment Module