CRM-13179 fix country autofill