fixes for country/state select